Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 967dd54b 由 LN
选项

hik接口bug修改

1 个父辈 73d5141b
内嵌 并排
正在显示 3 个修改的文件 包含 34 行增加 和 9 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java
...@@ -9,6 +9,9 @@ import com.neotel.smfcore.core.device.api.IOpAuthApi; ...@@ -9,6 +9,9 @@ import com.neotel.smfcore.core.device.api.IOpAuthApi;
import com.neotel.smfcore.core.device.bean.StatusBean; import com.neotel.smfcore.core.device.bean.StatusBean;
import com.neotel.smfcore.core.device.enums.OP; import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS; import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.inList.service.po.InList;
import com.neotel.smfcore.core.inList.service.po.InListItem;
import com.neotel.smfcore.core.inList.util.InListCache;
import com.neotel.smfcore.core.order.enums.ORDER_COLOR; import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
import com.neotel.smfcore.core.storage.enums.DeviceType; import com.neotel.smfcore.core.storage.enums.DeviceType;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
...@@ -21,6 +24,7 @@ import com.neotel.smfcore.core.system.websocket.SocketMsg; ...@@ -21,6 +24,7 @@ import com.neotel.smfcore.core.system.websocket.SocketMsg;
import com.neotel.smfcore.core.system.websocket.WebSocketServer; import com.neotel.smfcore.core.system.websocket.WebSocketServer;
import com.neotel.smfcore.hikvision.HikApi; import com.neotel.smfcore.hikvision.HikApi;
import com.neotel.smfcore.hikvision.bean.InOutApiInfo; import com.neotel.smfcore.hikvision.bean.InOutApiInfo;
import com.neotel.smfcore.hikvision.bean.TransferOrderInInfo;
import com.neotel.smfcore.security.TokenProvider; import com.neotel.smfcore.security.TokenProvider;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -38,6 +42,10 @@ import java.util.*; ...@@ -38,6 +42,10 @@ import java.util.*;
@RestController @RestController
@Slf4j @Slf4j
public class NLPShelfHandler extends BaseDeviceHandler{ public class NLPShelfHandler extends BaseDeviceHandler{
@Autowired
private InListCache inListCache;
@Autowired @Autowired
private TokenProvider tokenProvider; private TokenProvider tokenProvider;
public NLPShelfHandler(List<IOpAuthApi> apiList) { public NLPShelfHandler(List<IOpAuthApi> apiList) {
...@@ -368,8 +376,23 @@ public class NLPShelfHandler extends BaseDeviceHandler{ ...@@ -368,8 +376,23 @@ public class NLPShelfHandler extends BaseDeviceHandler{
log.error(msg); log.error(msg);
WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO,"smfclient.nlp.inputOk",new String[]{queueTask.getBarcode(),pos.getPosName()})); WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO,"smfclient.nlp.inputOk",new String[]{queueTask.getBarcode(),pos.getPosName()}));
//判断是否是入库单入库
if(queueTask.getInType()==5){
InList inList=inListCache.getInList(queueTask.getSourceName());
InListItem item= inListCache.UpdateInList(queueTask.getSourceName(),pos,pos.getBarcode());
if(item!=null){
//入库完成，调用 7.2转储单入库过账接口
TransferOrderInInfo inInfo=new TransferOrderInInfo(inList.getName(),inList.getDocType(),queueTask.getBarcode(),item.getBaseCode(),item.getInLgort(),queueTask.getNum());
boolean result= HikApi.transferOrderInApi(queueTask.getOperator(), inInfo);
}
}else{
//入库完成，调用 7.5入库上架过账接口 //入库完成，调用 7.5入库上架过账接口
boolean result= HikApi.putInApi("", InOutApiInfo.inputInfo(queueTask.getInType(),queueTask.getBarcode(),queueTask.getNum())); boolean result= HikApi.putInApi(queueTask.getOperator(), InOutApiInfo.inputInfo(queueTask.getInType(),queueTask.getBarcode(),queueTask.getNum()));
}
break; break;
} catch (Exception e) { } catch (Exception e) {
...@@ -419,7 +442,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{ ...@@ -419,7 +442,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO,"smfclient.nlp.outputOk",new String[]{queueTask.getBarcode(),posName})); WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO,"smfclient.nlp.outputOk",new String[]{queueTask.getBarcode(),posName}));
//出库完成，调用 ，7.6出库下架过账接口 //出库完成，调用 ，7.6出库下架过账接口
boolean result= HikApi.checkOutApi("",InOutApiInfo.outInfo( queueTask.getOutType(),queueTask.getBarcode(),queueTask.getNum(),queueTask.getBaseCode(),queueTask.getLgort())); boolean result= HikApi.checkOutApi(queueTask.getOperator(),InOutApiInfo.outInfo( queueTask.getOutType(),queueTask.getBarcode(),queueTask.getNum(),queueTask.getBaseCode(),queueTask.getLgort()));
break; break;
} catch (Exception e) { } catch (Exception e) {
......
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
...@@ -374,6 +374,13 @@ public class HikApi { ...@@ -374,6 +374,13 @@ public class HikApi {
public static boolean checkOutApi(String userName, InOutApiInfo param){ public static boolean checkOutApi(String userName, InOutApiInfo param){
String apiName="Hik 出库下架过账接口 (checkOutApi): "; String apiName="Hik 出库下架过账接口 (checkOutApi): ";
String url = getUrl( config.addr_6_checkOutApi,"checkOutApi"); String url = getUrl( config.addr_6_checkOutApi,"checkOutApi");
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(config.baseCode)){
param.setBaseCode(config.baseCode);
}
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(config.lgort)){
param.setLgort(config.lgort);
}
// warehousingType Integer 是 出库类型(0普通出库1并盘出库 2湿敏出库) // warehousingType Integer 是 出库类型(0普通出库1并盘出库 2湿敏出库)
// trayId String 41 是 料盘ID/唯一码 // trayId String 41 是 料盘ID/唯一码
// qty Integer 是 数量 // qty Integer 是 数量
...@@ -386,12 +393,7 @@ public class HikApi { ...@@ -386,12 +393,7 @@ public class HikApi {
dataMap.put("baseCode", param.getBaseCode());//基地 dataMap.put("baseCode", param.getBaseCode());//基地
dataMap.put("lgort", param.getLgort());//库位 dataMap.put("lgort", param.getLgort());//库位
if(ObjectUtil.isEmpty(param.getBaseCode())&& ObjectUtil.isNotEmpty(config.baseCode)){
param.setBaseCode(config.baseCode);
}
if(ObjectUtil.isEmpty(param.getLgort())&&ObjectUtil.isNotEmpty(config.lgort)){
param.setLgort(config.lgort);
}
// String data = JsonUtil.toJsonStr(dataMap); // String data = JsonUtil.toJsonStr(dataMap);
......
src/main/resources/config/application.yml
...@@ -30,7 +30,7 @@ hik: ...@@ -30,7 +30,7 @@ hik:
secret_2_transferOrderInApi: secret_2_transferOrderInApi:
secret_3_scheduleTaskApi: eR2RbW9zHVglHfDweBHPzDF2pYR0RpF1dUpHJKrVKLmYCyHErz2NjXvMsWNJoKgz secret_3_scheduleTaskApi: eR2RbW9zHVglHfDweBHPzDF2pYR0RpF1dUpHJKrVKLmYCyHErz2NjXvMsWNJoKgz
secret_4_returnMaterialApi: sRs9lFTsRYpTvORhSI32FhjEPhJDb6TzTvIxhPudrmo9jgwwCiKJWi8go1yN8988 secret_4_returnMaterialApi: sRs9lFTsRYpTvORhSI32FhjEPhJDb6TzTvIxhPudrmo9jgwwCiKJWi8go1yN8988
secret_5_putInApi: 1ifjm9mFtpXep0aJXOFtNi3R502v1Lzl6VuaKEKVZdQLmlKhzxIjjmtn29WDG7R0 secret_5_putInApi: gTLARhgpnbhSv7SNOvQtHoMxWapphmgRwO72vLsVj76CpGvdpImDsum0LVlrsymu
secret_6_checkOutApi: MDulYCOgEasYYJXOk2tLycnpYKS2HQK0vXcIvJNzPt79isaHJkyE24BcCzn3hTg4 secret_6_checkOutApi: MDulYCOgEasYYJXOk2tLycnpYKS2HQK0vXcIvJNzPt79isaHJkyE24BcCzn3hTg4
secret_7_updateOrderApi: HvbUVz6vQJYIDfmWokk98rxSUHAoDlUWNSsPuVc0hB8JtIOzZLDQYARW9tmeU2Fy secret_7_updateOrderApi: HvbUVz6vQJYIDfmWokk98rxSUHAoDlUWNSsPuVc0hB8JtIOzZLDQYARW9tmeU2Fy
secret_8_riCheckApi: eQPd3y8xDvwXKMetEbwp2LdzJe8tD0Dg48YA1H68SPsGeKSt2Yj3pOrKibguwzwe secret_8_riCheckApi: eQPd3y8xDvwXKMetEbwp2LdzJe8tD0Dg48YA1H68SPsGeKSt2Yj3pOrKibguwzwe
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!