From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
index fd347b0..1000c64 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.java
@@ -26,8 +26,6 @@
public static final String BEAN_ID = "bhznGrain.remoteGrainService";
@Autowired
- private CoreSerService coreSerService;
- @Autowired
private BhznGrainV1ServerEngine bhznGrainServerEngine;
@Override
@@ -39,8 +37,28 @@
public GrainResponse checkGrain(CheckGrainRequest request) {
try {
// 鐢熸垚绮儏淇℃伅
- String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
-
+ String hexStr = "";
+ if("5323".equals(request.getCompanyId())){
+ if("0P01".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "1");
+ }else if("0P02".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "1");
+ }else if("0P03".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "2");
+ }else if("0P04".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "2");
+ }else if("0P05".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "3");
+ }else if("0P06".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }else if("0P07".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }else if("0P08".equals(request.getDepotId())){
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), "4");
+ }
+ }else{
+ hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
+ }
// //閫氳浣跨敤鐨勬槸涓绘満閫氳
// DeviceSer mainSer = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
--
Gitblit v1.9.3