Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8ee00be2 由 hc
选项

fix:类名修改

1 个父辈 a88d9388
内嵌 并排
正在显示 10 个修改的文件 包含 21 行增加 和 25 行删除
src/main/java/com/neotel/smfcore/core/api/SmfApi.java
...@@ -8,7 +8,7 @@ import com.neotel.smfcore.core.api.bean.CodeValidateParam; ...@@ -8,7 +8,7 @@ import com.neotel.smfcore.core.api.bean.CodeValidateParam;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.order.service.po.LiteOrder; import com.neotel.smfcore.core.order.service.po.LiteOrder;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings; import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -63,7 +63,7 @@ public class SmfApi { ...@@ -63,7 +63,7 @@ public class SmfApi {
protected String importUrl; protected String importUrl;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@PostConstruct @PostConstruct
public void init(){ public void init(){
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java
...@@ -21,7 +21,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -21,7 +21,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.bean.OrderSetting; import com.neotel.smfcore.core.system.bean.OrderSetting;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil; import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.lizhen.innerBox.rest.InnerBoxRestController; import com.neotel.smfcore.custom.lizhen.innerBox.rest.InnerBoxRestController;
import com.neotel.smfcore.security.TokenProvider; import com.neotel.smfcore.security.TokenProvider;
...@@ -57,7 +57,7 @@ public class NLShelfHandler extends BaseDeviceHandler { ...@@ -57,7 +57,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
private InListCache inListCache; private InListCache inListCache;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
String putInColor = "green"; String putInColor = "green";
int delayCloseTime = 30000; int delayCloseTime = 30000;
......
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao; ...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
import com.neotel.smfcore.core.system.service.po.AlarmInfo; import com.neotel.smfcore.core.system.service.po.AlarmInfo;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager; import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
...@@ -66,7 +66,7 @@ public class DeviceController { ...@@ -66,7 +66,7 @@ public class DeviceController {
private SmfApi smfApi; private SmfApi smfApi;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@Autowired @Autowired
private IBarcodeManager barcodeManager; private IBarcodeManager barcodeManager;
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -30,7 +30,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -30,7 +30,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.innerBox.bean.StorageExport; import com.neotel.smfcore.custom.lizhen.innerBox.bean.StorageExport;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.lizhen.innerBox.util.StorageExportUtil; import com.neotel.smfcore.custom.lizhen.innerBox.util.StorageExportUtil;
...@@ -75,7 +75,7 @@ public class LiteOrderCache { ...@@ -75,7 +75,7 @@ public class LiteOrderCache {
private IBarcodeManager barcodeManager; private IBarcodeManager barcodeManager;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@Autowired @Autowired
private MaiZhengApi maiZhengApi; private MaiZhengApi maiZhengApi;
......
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
...@@ -28,7 +28,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -28,7 +28,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.dao.IDataLogDao; import com.neotel.smfcore.core.system.service.dao.IDataLogDao;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager; import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -63,7 +63,7 @@ public class TaskService { ...@@ -63,7 +63,7 @@ public class TaskService {
private ILiteOrderItemManager liteOrderItemManager; private ILiteOrderItemManager liteOrderItemManager;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@Autowired @Autowired
private IVirInventoryManager virInventoryManager; private IVirInventoryManager virInventoryManager;
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/InventoryController.java
...@@ -20,7 +20,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -20,7 +20,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.agvBox.bean.InventoryData; import com.neotel.smfcore.custom.lizhen.agvBox.bean.InventoryData;
import com.neotel.smfcore.custom.lizhen.agvBox.bean.PartitionInfo; import com.neotel.smfcore.custom.lizhen.agvBox.bean.PartitionInfo;
import com.neotel.smfcore.custom.lizhen.agvBox.bean.Station; import com.neotel.smfcore.custom.lizhen.agvBox.bean.Station;
...@@ -74,7 +74,7 @@ public class InventoryController { ...@@ -74,7 +74,7 @@ public class InventoryController {
private CodeResolve codeResolve; private CodeResolve codeResolve;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
/** /**
* 盘点数据key * 盘点数据key
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java
...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.agvBox.enums.INOUT_TYPE; import com.neotel.smfcore.custom.lizhen.agvBox.enums.INOUT_TYPE;
import com.neotel.smfcore.custom.lizhen.agvBox.util.BoxUtil; import com.neotel.smfcore.custom.lizhen.agvBox.util.BoxUtil;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
...@@ -68,7 +68,7 @@ public class OutLineController { ...@@ -68,7 +68,7 @@ public class OutLineController {
private ILiteOrderItemManager liteOrderItemManager; private ILiteOrderItemManager liteOrderItemManager;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
/* /*
* key为工位信息,value为上一个隔口信息 * key为工位信息,value为上一个隔口信息
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/WarehouseController.java
...@@ -21,7 +21,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -21,7 +21,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.agvBox.bean.GrLabel; import com.neotel.smfcore.custom.lizhen.agvBox.bean.GrLabel;
import com.neotel.smfcore.custom.lizhen.agvBox.bean.Station; import com.neotel.smfcore.custom.lizhen.agvBox.bean.Station;
import com.neotel.smfcore.custom.lizhen.agvBox.enums.INOUT_TYPE; import com.neotel.smfcore.custom.lizhen.agvBox.enums.INOUT_TYPE;
...@@ -70,7 +70,7 @@ public class WarehouseController { ...@@ -70,7 +70,7 @@ public class WarehouseController {
private DataCache dataCache; private DataCache dataCache;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@Autowired @Autowired
private GrLabelManager grLabelManager; private GrLabelManager grLabelManager;
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/LizhenApi.java → src/main/java/com/neotel/smfcore/custom/lizhen/api/LizhenApiListener.java
package com.neotel.smfcore.custom.lizhen.api; package com.neotel.smfcore.custom.lizhen.api;
import com.alibaba.fastjson.JSON;
import com.neotel.smfcore.common.utils.HttpHelper;
import com.neotel.smfcore.core.api.listener.DefaultSmfApiListener; import com.neotel.smfcore.core.api.listener.DefaultSmfApiListener;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetSpareNoRequest;
import com.neotel.smfcore.custom.lizhen.api.bean.result.GetSpareNoResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Slf4j @Slf4j
@Component @Component
public class LizhenApi extends DefaultSmfApiListener { public class LizhenApiListener extends DefaultSmfApiListener {
public static String GetSpareNoUrl; public static String GetSpareNoUrl;
@Value("${api.getSpareNo}") @Value("${api.getSpareNo:}")
public void setGetSpareNoUrl(String url) { public void setGetSpareNoUrl(String url) {
LizhenApi.GetSpareNoUrl = url; LizhenApiListener.GetSpareNoUrl = url;
} }
/*public static GetSpareNoResult getSpareNo(GetSpareNoRequest request) { /*public static GetSpareNoResult getSpareNo(GetSpareNoRequest request) {
......
src/main/java/com/neotel/smfcore/custom/lizhen/virtual/controller/VirtualRestController.java
...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -23,7 +23,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.manager.IDataLogManager; import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.api.LizhenApi; import com.neotel.smfcore.custom.lizhen.api.LizhenApiListener;
import com.neotel.smfcore.custom.lizhen.innerBox.bean.VirImportLog; import com.neotel.smfcore.custom.lizhen.innerBox.bean.VirImportLog;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.lizhen.innerBox.service.manager.IVirImportLogManager; import com.neotel.smfcore.custom.lizhen.innerBox.service.manager.IVirImportLogManager;
...@@ -66,7 +66,7 @@ public class VirtualRestController { ...@@ -66,7 +66,7 @@ public class VirtualRestController {
private TaskService taskService; private TaskService taskService;
@Autowired @Autowired
private LizhenApi lizhenApi; private LizhenApiListener lizhenApi;
@Autowired @Autowired
private SmfApi smfApi; private SmfApi smfApi;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!