Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 78ea30c1 由 zshaohui
选项

结构提交

1 个父辈 293d58f1
内嵌 并排
正在显示 34 个修改的文件 包含 248 行增加 和 488 行删除
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.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
@PostConstruct @PostConstruct
public void init(){ public void init(){
......
src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java
...@@ -140,8 +140,8 @@ public class CodeResolve { ...@@ -140,8 +140,8 @@ public class CodeResolve {
if (!lastLabelPartNumber.equals(currentLabelPartNumber)) { if (!lastLabelPartNumber.equals(currentLabelPartNumber)) {
//本次解析出来的数量与上次条码解析出来的数量不一样,重新设置数量 //本次解析出来的数量与上次条码解析出来的数量不一样,重新设置数量
log.info("重新设置" + codeBeanFromRule.getCodeStr() + "partNumber为:" + currentLabelPartNumber); log.info("重新设置" + codeBeanFromRule.getCodeStr() + "partNumber为:" + currentLabelPartNumber);
barcode.setPartNumber(currentLabelPartNumber); //barcode.setPartNumber(currentLabelPartNumber);
needUpdate = true; //needUpdate = true;
} }
Date produceDate = barcodeFromRule.getProduceDate(); Date produceDate = barcodeFromRule.getProduceDate();
if(produceDate != null){ if(produceDate != null){
...@@ -190,8 +190,8 @@ public class CodeResolve { ...@@ -190,8 +190,8 @@ public class CodeResolve {
} }
//设置label数量 //设置label数量
if (barcodeFromRule.getLabelAmount() != barcode.getLabelAmount()) { if (barcodeFromRule.getLabelAmount() != barcode.getLabelAmount()) {
barcode.setLabelAmount(barcodeFromRule.getLabelAmount()); //barcode.setLabelAmount(barcodeFromRule.getLabelAmount());
needUpdate = true; //needUpdate = true;
} }
if(needUpdate){ if(needUpdate){
try { try {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java
...@@ -21,9 +21,9 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -21,9 +21,9 @@ 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.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.custom.luxsan_sp.api.LuxsanSpApi;
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;
...@@ -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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
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.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
@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.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
@Autowired @Autowired
private MaiZhengApi maiZhengApi; private MaiZhengApi maiZhengApi;
......
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
...@@ -28,9 +28,9 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -28,9 +28,9 @@ 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.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.custom.luxsan_sp.api.LuxsanSpApi;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -63,7 +63,7 @@ public class TaskService { ...@@ -63,7 +63,7 @@ public class TaskService {
private ILiteOrderItemManager liteOrderItemManager; private ILiteOrderItemManager liteOrderItemManager;
@Autowired @Autowired
private LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
@Autowired @Autowired
private IVirInventoryManager virInventoryManager; private IVirInventoryManager virInventoryManager;
......
src/main/java/com/neotel/smfcore/custom/lizhen/LizhenController.java
...@@ -3,7 +3,6 @@ package com.neotel.smfcore.custom.lizhen; ...@@ -3,7 +3,6 @@ package com.neotel.smfcore.custom.lizhen;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.exception.ApiException; import com.neotel.smfcore.common.exception.ApiException;
...@@ -23,15 +22,14 @@ import com.neotel.smfcore.core.order.service.po.LiteOrder; ...@@ -23,15 +22,14 @@ import com.neotel.smfcore.core.order.service.po.LiteOrder;
import com.neotel.smfcore.core.order.service.po.LiteOrderItem; import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
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.custom.lizhen.api.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetReturnInventoryRequest; import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.GetReturnInventoryRequest;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetSpareNoRequest;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetUnclaimedRequest;
import com.neotel.smfcore.custom.lizhen.api.bean.request.SpareInHourseRequest;
import com.neotel.smfcore.custom.lizhen.api.bean.result.SpareInHourseResult;
import com.neotel.smfcore.custom.lizhen.innerBox.bean.PreWarningItem; import com.neotel.smfcore.custom.lizhen.innerBox.bean.PreWarningItem;
import com.neotel.smfcore.custom.lizhen.innerBox.util.PreWarningItemCache; import com.neotel.smfcore.custom.lizhen.innerBox.util.PreWarningItemCache;
import com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBoxList; import com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBoxList;
import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.GetSpareNoRequest;
import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.GetUnclaimedRequest;
import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.SpareInHourseRequest;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -371,7 +369,7 @@ public class LizhenController { ...@@ -371,7 +369,7 @@ public class LizhenController {
GetSpareNoRequest spareNoRequest = new GetSpareNoRequest(); GetSpareNoRequest spareNoRequest = new GetSpareNoRequest();
spareNoRequest.setFunctionDept(functionDept); spareNoRequest.setFunctionDept(functionDept);
spareNoRequest.setDeptId(deptId); spareNoRequest.setDeptId(deptId);
return ResultBean.newOkResult(LizhenApiListener.getSpareNo(spareNoRequest)); return ResultBean.newOkResult(LuxsanSpApi.getSpareNo(spareNoRequest));
} }
// 退库查询接口 // 退库查询接口
...@@ -391,7 +389,7 @@ public class LizhenController { ...@@ -391,7 +389,7 @@ public class LizhenController {
GetReturnInventoryRequest request = new GetReturnInventoryRequest(); GetReturnInventoryRequest request = new GetReturnInventoryRequest();
request.setFunctionDept(functionDept); request.setFunctionDept(functionDept);
request.setDeptId(deptId); request.setDeptId(deptId);
return ResultBean.newOkResult(LizhenApiListener.getReturnInventory(request)); return ResultBean.newOkResult(LuxsanSpApi.getReturnInventory(request));
} }
// 预约待领取接口 // 预约待领取接口
...@@ -412,7 +410,7 @@ public class LizhenController { ...@@ -412,7 +410,7 @@ public class LizhenController {
request.setFunctionDept(functionDept); request.setFunctionDept(functionDept);
request.setDeptId(deptId); request.setDeptId(deptId);
// 假设还有其它参数需要解析 // 假设还有其它参数需要解析
return ResultBean.newOkResult(LizhenApiListener.getUnclaimedDetails(request)); return ResultBean.newOkResult(LuxsanSpApi.getUnclaimedDetails(request));
} }
// 备品仓入库接口 // 备品仓入库接口
...@@ -432,7 +430,7 @@ public class LizhenController { ...@@ -432,7 +430,7 @@ public class LizhenController {
if (ObjectUtil.isNotEmpty(request.getDetailList())) { if (ObjectUtil.isNotEmpty(request.getDetailList())) {
return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}料号明细列表不能为空", new String[]{""}); return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}料号明细列表不能为空", new String[]{""});
} }
return ResultBean.newOkResult(LizhenApiListener.spareInHourse(request)); return ResultBean.newOkResult(LuxsanSpApi.spareInHourse(request));
} }
......
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.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
/** /**
* 盘点数据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.LizhenApiListener; import com.neotel.smfcore.custom.luxsan_sp.api.LuxsanSpApi;
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 LizhenApiListener lizhenApi; private LuxsanSpApi luxsanSpApi;
/* /*
* key为工位信息,value为上一个隔口信息 * key为工位信息,value为上一个隔口信息
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/WarehouseController.java
...@@ -21,7 +21,6 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -21,7 +21,6 @@ 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.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,9 +69,6 @@ public class WarehouseController { ...@@ -70,9 +69,6 @@ public class WarehouseController {
private DataCache dataCache; private DataCache dataCache;
@Autowired @Autowired
private LizhenApiListener lizhenApi;
@Autowired
private GrLabelManager grLabelManager; private GrLabelManager grLabelManager;
@Autowired @Autowired
......
src/main/java/com/neotel/smfcore/custom/lizhen/virtual/controller/VirtualRestController.java
...@@ -23,7 +23,6 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -23,7 +23,6 @@ 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.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,9 +65,6 @@ public class VirtualRestController { ...@@ -66,9 +65,6 @@ public class VirtualRestController {
private TaskService taskService; private TaskService taskService;
@Autowired @Autowired
private LizhenApiListener lizhenApi;
@Autowired
private SmfApi smfApi; private SmfApi smfApi;
@Autowired @Autowired
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/LizhenApiListener.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/LuxsanSpApi.java
package com.neotel.smfcore.custom.lizhen.api; package com.neotel.smfcore.custom.luxsan_sp.api;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -8,15 +8,11 @@ import com.neotel.smfcore.common.exception.ValidateException; ...@@ -8,15 +8,11 @@ import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.HttpHelper; import com.neotel.smfcore.common.utils.HttpHelper;
import com.neotel.smfcore.common.utils.StringUtils; import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.api.listener.DefaultSmfApiListener; import com.neotel.smfcore.core.api.listener.DefaultSmfApiListener;
import com.neotel.smfcore.custom.lizhen.api.bean.LizhenApiResult; import com.neotel.smfcore.custom.luxsan_sp.api.bean.LuxsanSpApiResult;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetReturnInventoryRequest; import com.neotel.smfcore.custom.luxsan_sp.api.bean.request.*;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetSpareNoRequest; import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.GetSpareNoResult;
import com.neotel.smfcore.custom.lizhen.api.bean.request.GetUnclaimedRequest; import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.GetUnclaimedResult;
import com.neotel.smfcore.custom.lizhen.api.bean.request.SpareInHourseRequest; import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.SpareInHourseResult;
import com.neotel.smfcore.custom.lizhen.api.bean.result.GetReturnInventoryResult;
import com.neotel.smfcore.custom.lizhen.api.bean.result.GetSpareNoResult;
import com.neotel.smfcore.custom.lizhen.api.bean.result.GetUnclaimedResult;
import com.neotel.smfcore.custom.lizhen.api.bean.result.SpareInHourseResult;
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;
...@@ -25,7 +21,7 @@ import java.util.Map; ...@@ -25,7 +21,7 @@ import java.util.Map;
@Slf4j @Slf4j
@Component @Component
public class LizhenApiListener extends DefaultSmfApiListener { public class LuxsanSpApi extends DefaultSmfApiListener {
public static String GetSpareNoUrl; public static String GetSpareNoUrl;
public static String SpareInHourseUrl; public static String SpareInHourseUrl;
...@@ -34,19 +30,19 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -34,19 +30,19 @@ public class LizhenApiListener extends DefaultSmfApiListener {
@Value("${api.getSpareNo:}") @Value("${api.getSpareNo:}")
public void setGetSpareNoUrl(String url) { public void setGetSpareNoUrl(String url) {
LizhenApiListener.GetSpareNoUrl = url; LuxsanSpApi.GetSpareNoUrl = url;
} }
@Value("${api.spareInhourse:}") @Value("${api.spareInhourse:}")
public void setSpareInHourseUrl(String url) { public void setSpareInHourseUrl(String url) {
LizhenApiListener.SpareInHourseUrl = url; LuxsanSpApi.SpareInHourseUrl = url;
} }
@Value("${api.getUnclaimed:}") @Value("${api.getUnclaimed:}")
private void setGetUnclaimedUrl(String url) { private void setGetUnclaimedUrl(String url) {
LizhenApiListener.GetUnclaimedUrl = url; LuxsanSpApi.GetUnclaimedUrl = url;
} }
@Value("${api.getReturnInventory:}") @Value("${api.getReturnInventory:}")
private void setGetReturnInventory(String url) { private void setGetReturnInventory(String url) {
LizhenApiListener.GetReturnInventory = url; LuxsanSpApi.GetReturnInventory = url;
} }
// 备品仓退库查询接口的GET方法 // 备品仓退库查询接口的GET方法
...@@ -60,7 +56,7 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -60,7 +56,7 @@ public class LizhenApiListener extends DefaultSmfApiListener {
String resJsonStr = HttpHelper.sendGet(url); String resJsonStr = HttpHelper.sendGet(url);
log.info("备品仓退库查询接口返回为:" + JSON.toJSONString(request)); log.info("备品仓退库查询接口返回为:" + JSON.toJSONString(request));
// 将响应字符串解析为LizhenApiResult对象 // 将响应字符串解析为LizhenApiResult对象
LizhenApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LizhenApiResult.class); LuxsanSpApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LuxsanSpApiResult.class);
// 检查API调用是否成功，并返回结果对象 // 检查API调用是否成功，并返回结果对象
if (ObjectUtil.isNotNull(lizhenApiResult)) { if (ObjectUtil.isNotNull(lizhenApiResult)) {
if (lizhenApiResult.getCode() != 200) { if (lizhenApiResult.getCode() != 200) {
...@@ -86,7 +82,7 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -86,7 +82,7 @@ public class LizhenApiListener extends DefaultSmfApiListener {
String url = GetUnclaimedUrl + getQueryStr(request); String url = GetUnclaimedUrl + getQueryStr(request);
log.info("预约待领取接口请求返回:" + JSON.toJSONString(request)); log.info("预约待领取接口请求返回:" + JSON.toJSONString(request));
String resJsonStr = HttpHelper.sendGet(url); String resJsonStr = HttpHelper.sendGet(url);
LizhenApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LizhenApiResult.class); LuxsanSpApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LuxsanSpApiResult.class);
if (lizhenApiResult.getCode() != 200) { if (lizhenApiResult.getCode() != 200) {
throw new Exception(String.format("预约待领取接口接口请求失败, 错误代码[%d]，错误原因[%s]", throw new Exception(String.format("预约待领取接口接口请求失败, 错误代码[%d]，错误原因[%s]",
lizhenApiResult.getCode(), lizhenApiResult.getMsg())); lizhenApiResult.getCode(), lizhenApiResult.getMsg()));
...@@ -109,7 +105,7 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -109,7 +105,7 @@ public class LizhenApiListener extends DefaultSmfApiListener {
log.info("备品仓入库接口请求为:" + JSON.toJSONString(request)); log.info("备品仓入库接口请求为:" + JSON.toJSONString(request));
String resJsonStr = HttpHelper.postJson(SpareInHourseUrl, request); String resJsonStr = HttpHelper.postJson(SpareInHourseUrl, request);
log.info("备品仓入库接口返回:" + JSON.toJSONString(request)); log.info("备品仓入库接口返回:" + JSON.toJSONString(request));
LizhenApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LizhenApiResult.class); LuxsanSpApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LuxsanSpApiResult.class);
if (lizhenApiResult.getCode() != 200) { if (lizhenApiResult.getCode() != 200) {
throw new ApiException(String.format("备品仓入库接口请求失败, 错误代码[%d]，错误原因[%s]", throw new ApiException(String.format("备品仓入库接口请求失败, 错误代码[%d]，错误原因[%s]",
lizhenApiResult.getCode(), lizhenApiResult.getMsg())); lizhenApiResult.getCode(), lizhenApiResult.getMsg()));
...@@ -132,7 +128,7 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -132,7 +128,7 @@ public class LizhenApiListener extends DefaultSmfApiListener {
String url = GetSpareNoUrl + getQueryStr(request); String url = GetSpareNoUrl + getQueryStr(request);
log.info("获取入库单号返回:" + JSON.toJSONString(request)); log.info("获取入库单号返回:" + JSON.toJSONString(request));
String resJsonStr = HttpHelper.sendGet(url); String resJsonStr = HttpHelper.sendGet(url);
LizhenApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LizhenApiResult.class); LuxsanSpApiResult lizhenApiResult = JSONObject.parseObject(resJsonStr, LuxsanSpApiResult.class);
if (lizhenApiResult.getCode() != 200) { if (lizhenApiResult.getCode() != 200) {
throw new Exception(String.format("获取入库单号接口请求失败, 错误代码[%d]，错误原因[%s]", throw new Exception(String.format("获取入库单号接口请求失败, 错误代码[%d]，错误原因[%s]",
lizhenApiResult.getCode(), lizhenApiResult.getMsg())); lizhenApiResult.getCode(), lizhenApiResult.getMsg()));
...@@ -149,18 +145,9 @@ public class LizhenApiListener extends DefaultSmfApiListener { ...@@ -149,18 +145,9 @@ public class LizhenApiListener extends DefaultSmfApiListener {
} }
@Override @Override
public boolean isForThisApi(String apiName) { public boolean isForThisApi(String apiName) {
return apiName != null && apiName.equalsIgnoreCase("Lizhen"); return apiName != null && apiName.equalsIgnoreCase("Luxsan_sp");
} }
private static String getQueryStr(Object obj) { private static String getQueryStr(Object obj) {
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/LizhenApiResult.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/LuxsanSpApiResult.java
package com.neotel.smfcore.custom.lizhen.api.bean; package com.neotel.smfcore.custom.luxsan_sp.api.bean;
import lombok.Data; import lombok.Data;
@Data @Data
public class LizhenApiResult { public class LuxsanSpApiResult {
private String msg; private String msg;
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/request/GetReturnInventoryRequest.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/request/GetReturnInventoryRequest.java
package com.neotel.smfcore.custom.lizhen.api.bean.request; package com.neotel.smfcore.custom.luxsan_sp.api.bean.request;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/request/GetReturnInventoryResult.java 0 → 100644
package com.neotel.smfcore.custom.luxsan_sp.api.bean.request;
import lombok.Data;
@Data
public class GetReturnInventoryResult {
/**
* 功能部门
*/
private String functionDept;
/**
* 厂区id
*/
private String deptId;
}
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/request/GetSpareNoRequest.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/request/GetSpareNoRequest.java
package com.neotel.smfcore.custom.lizhen.api.bean.request; package com.neotel.smfcore.custom.luxsan_sp.api.bean.request;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/request/GetUnclaimedRequest.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/request/GetUnclaimedRequest.java
package com.neotel.smfcore.custom.lizhen.api.bean.request; package com.neotel.smfcore.custom.luxsan_sp.api.bean.request;
import lombok.Data; import lombok.Data;
/**
* 请求类，用于获取未领取的备件申请信息
*/
@Data @Data
public class GetUnclaimedRequest { public class GetUnclaimedRequest {
/** /**
* 厂区id * 厂区id
*/ */
...@@ -15,4 +13,5 @@ public class GetUnclaimedRequest { ...@@ -15,4 +13,5 @@ public class GetUnclaimedRequest {
* 功能部门 * 功能部门
*/ */
private String functionDept; private String functionDept;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/request/SpareInHourseRequest.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/request/SpareInHourseRequest.java
package com.neotel.smfcore.custom.lizhen.api.bean.request; package com.neotel.smfcore.custom.luxsan_sp.api.bean.request;
import com.neotel.smfcore.custom.lizhen.api.bean.result.SpareInHourseDetail; import com.neotel.smfcore.custom.luxsan_sp.api.bean.result.SpareInHourseDetail;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
/**
* 请求类，用于表示SpareInHourse的请求参数
*/
@Data @Data
public class SpareInHourseRequest { public class SpareInHourseRequest {
/** /**
* 厂区id * 厂区id
*/ */
...@@ -29,4 +27,5 @@ public class SpareInHourseRequest { ...@@ -29,4 +27,5 @@ public class SpareInHourseRequest {
* 料号明细列表 * 料号明细列表
*/ */
private List<SpareInHourseDetail> detailList; private List<SpareInHourseDetail> detailList;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/GetReturnInventoryResult.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/GetReturnInventoryResult.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* 响应类，用于表示获取退库库存结果
*/
@Data @Data
public class GetReturnInventoryResult { public class GetReturnInventoryResult {
/** /**
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/GetSpareNoDetail.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/GetSpareNoDetail.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/GetSpareNoResult.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/GetSpareNoResult.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/GetUnclaimedResult.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/GetUnclaimedResult.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* 请求类，用于获取未领取的备件申请信息
*/
@Data @Data
public class GetUnclaimedResult { public class GetUnclaimedResult {
/** /**
...@@ -39,4 +36,3 @@ public class GetUnclaimedResult { ...@@ -39,4 +36,3 @@ public class GetUnclaimedResult {
*/ */
private List<SpareApplyDetail> spareApplyDetailList; private List<SpareApplyDetail> spareApplyDetailList;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/SpareApplyDetail.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/SpareApplyDetail.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
/**
* 封装备件申请明细信息
*/
@Data @Data
public class SpareApplyDetail { public class SpareApplyDetail {
/** /**
* 单据号 * 单据号
*/ */
...@@ -31,4 +29,5 @@ public class SpareApplyDetail { ...@@ -31,4 +29,5 @@ public class SpareApplyDetail {
* 预计数量 * 预计数量
*/ */
private Integer expectQty; private Integer expectQty;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/SpareInHourseDetail.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/SpareInHourseDetail.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
/**
* 封装料号明细中的详细信息
*/
@Data @Data
public class SpareInHourseDetail { public class SpareInHourseDetail {
/** /**
* 料号 * 料号
*/ */
...@@ -14,9 +12,9 @@ public class SpareInHourseDetail { ...@@ -14,9 +12,9 @@ public class SpareInHourseDetail {
/** /**
* 储位 * 储位
*/ */
private String locationCode;
/** /**
* 数量 * 数量
*/ */
private Integer inQty; private Integer inQty;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/api/bean/result/SpareInHourseResult.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/api/bean/result/SpareInHourseResult.java
package com.neotel.smfcore.custom.lizhen.api.bean.result; package com.neotel.smfcore.custom.luxsan_sp.api.bean.result;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
/**
* 表示SpareInHourse的结果
*/
@Data @Data
public class SpareInHourseResult { public class SpareInHourseResult {
/** /**
* 厂区id * 厂区id
*/ */
...@@ -24,4 +23,5 @@ public class SpareInHourseResult { ...@@ -24,4 +23,5 @@ public class SpareInHourseResult {
* 料号明细列表 * 料号明细列表
*/ */
private List<SpareInHourseDetail> detailList; private List<SpareInHourseDetail> detailList;
} }
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/AgvBoxDeviceClientController.java → src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpAgvDeviceClientController.java
package com.neotel.smfcore.custom.lizhen.agvBox.rest; package com.neotel.smfcore.custom.luxsan_sp.controller;
import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.utils.JsonUtil;
import com.neotel.smfcore.common.utils.ReelLockPosUtil; import com.neotel.smfcore.common.utils.ReelLockPosUtil;
import com.neotel.smfcore.common.utils.StringUtils; import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
...@@ -17,16 +15,13 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -17,16 +15,13 @@ 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.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.core.system.websocket.MsgType;
import com.neotel.smfcore.core.system.websocket.SocketMsg;
import com.neotel.smfcore.core.system.websocket.WebSocketServer;
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.util.StationCacheUtil; import com.neotel.smfcore.custom.lizhen.agvBox.util.StationCacheUtil;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.luxsan_sp.util.SpBoxUtil;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
...@@ -43,7 +38,7 @@ import java.util.stream.Collectors; ...@@ -43,7 +38,7 @@ import java.util.stream.Collectors;
*/ */
@Slf4j @Slf4j
@RestController @RestController
public class AgvBoxDeviceClientController { public class SpAgvDeviceClientController {
@Autowired @Autowired
private DataCache dataCache; private DataCache dataCache;
...@@ -226,7 +221,7 @@ public class AgvBoxDeviceClientController { ...@@ -226,7 +221,7 @@ public class AgvBoxDeviceClientController {
} }
} }
} }
StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode, "", ""); StoragePos pos = SpBoxUtil.locOnePos(barcode);
if (pos != null){ if (pos != null){
Storage storage = dataCache.getStorageById(pos.getStorageId()); Storage storage = dataCache.getStorageById(pos.getStorageId());
taskService.addPutInTaskToExecute(storage,barcode,pos,""); taskService.addPutInTaskToExecute(storage,barcode,pos,"");
...@@ -417,7 +412,7 @@ public class AgvBoxDeviceClientController { ...@@ -417,7 +412,7 @@ public class AgvBoxDeviceClientController {
/** /**
* 仓位状态 * 仓位状态
*/ */
storagePos.setBarcode(barcode); //storagePos.setBarcode(barcode);
storagePos.setUsed(true); storagePos.setUsed(true);
storagePos.setCanCheckOutTime(System.currentTimeMillis()); storagePos.setCanCheckOutTime(System.currentTimeMillis());
storagePosManager.save(storagePos); storagePosManager.save(storagePos);
...@@ -454,8 +449,8 @@ public class AgvBoxDeviceClientController { ...@@ -454,8 +449,8 @@ public class AgvBoxDeviceClientController {
barcodeManager.save(barcode); barcodeManager.save(barcode);
} }
storagePos.setBarcode(null); //storagePos.setBarcode(null);
storagePos.setUsed(false); //storagePos.setUsed(false);
storagePosManager.save(storagePos); storagePosManager.save(storagePos);
log.info("出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]"); log.info("出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]");
......
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpBoxCheckOutController.java 0 → 100644
package com.neotel.smfcore.custom.luxsan_sp.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ApiOperation("备件仓 料箱入库")
@RestController
@RequestMapping("/spBoxCheckOut")
public class SpBoxCheckOutController {
}
src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpBoxPutInController.java 0 → 100644
package com.neotel.smfcore.custom.luxsan_sp.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ApiOperation("备件仓 料箱入库")
@RestController
@RequestMapping("/spBoxPutIn")
public class SpBoxPutInController {
}
src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpBoxUtil.java 0 → 100644
package com.neotel.smfcore.custom.luxsan_sp.util;
import com.neotel.smfcore.common.bean.ReelLockPosInfo;
import com.neotel.smfcore.common.utils.ReelLockPosUtil;
import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.util.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Service
public class SpBoxUtil {
private static IStoragePosManager storagePosManager;
@Autowired
public void setStoragePosManager(IStoragePosManager manager){
SpBoxUtil.storagePosManager = manager;
}
private static TaskService taskService;
@Autowired
public void setTaskService(TaskService service){
SpBoxUtil.taskService = service;
}
private static DataCache dataCache;
@Autowired
public void setDataCache(DataCache cache){
SpBoxUtil.dataCache = cache;
}
public static synchronized StoragePos locOnePos(Barcode boxBarcode) {
//判断信息是否在已经在库位中(出入库只改变料箱位置状态,不从StoragePos表中清除)
StoragePos pos = storagePosManager.getByBarcode(boxBarcode.getBarcode());
if (pos != null) {
return pos;
}
List<String> cidList = new ArrayList<>();
List<Storage> storageList = new ArrayList<>();
for (Storage storage : dataCache.getAllStorage().values()) {
if (!storage.isVirtual()) {
storageList.add(storage);
cidList.add(storage.getCid());
}
}
pos = taskService.findEmptyPosForPutIn(storageList, boxBarcode, "", "");
if (pos == null) {
log.info(boxBarcode.getBarcode() + "未找到可用库位");
return null;
} else {
log.info("料箱[" + boxBarcode.getBarcode() + "]信息加入库位[" + pos.getPosName() + "]中");
pos.setBarcode(boxBarcode);
pos.setUsed(true);
storagePosManager.save(pos);
//3.锁定库位
Storage storage = dataCache.getStorageById(pos.getStorageId());
ReelLockPosInfo reelLocInfo = new ReelLockPosInfo();
reelLocInfo.setBarcode(boxBarcode.getBarcode());
reelLocInfo.setCid(storage.getCid());
reelLocInfo.setLockPosName(pos.getPosName());
reelLocInfo.setLockPosId(pos.getId());
reelLocInfo = ReelLockPosUtil.addReelLockPosInfo(reelLocInfo, cidList);
if (reelLocInfo == null) {
log.info("[" + boxBarcode.getBarcode() + "]库位锁定失败,暂停入库");
return null;
}
}
return pos;
}
}
src/main/resources/config/application-21088prod.yml deleted 100644 → 0
#厂区名称
luxsan:
plantCode: W339
#C区配置文件
api:
name: luxsan
#todo 后续需要改成半成品仓地址
cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn
#禁用料
inCheckUrl: http://10.190.25.124:8001/Npm/WmsCheckReelfob
#储位查询
queryBin: http://10.68.30.22:8082/api/mlb/QueryBin
#更新储位
updateBin: http://10.68.30.22:8082/api/mlb/UpdateBin
#GR查询
queryGr: http://10.68.30.22:8082/api/mlb/QueryGR
#校验DC有效期
getInDate: http://10.68.30.22:8082/api/mes/GetInDate
#GR过账状态查询
queryGrStatus: http://10.68.30.22:8082/api/mlb/QueryGrStatus
#按GR生成标签码并上架
newLabelToCell: http://10.68.30.22:8082/api/mlb/NewLabelToCell
#电子料入退库
backToWarehouse: http://10.68.30.22:8082/api/mlb/BackToWarehouse
#Tower发料
towerIssue: http://10.68.30.22:8082/api/mlb/TowerIssue;
#pk发料
pickingIssue: http://10.68.30.22:8082/api/mlb/PickingIssue
#料卷退PK
returnToPK: http://10.68.30.22:8082/api/mlb/ReturnToPK
#单据挑料
ticketPost: http://10.68.30.22:8082/api/mlb/TicketPost
#拆分标签码
splitLabelID:
#合并标签码
mergeLabelID:
#单据产生标签码
getLabelByTicket:
#标签码信息查询
queryLabelID:
#标签码上架
labelUpToShelf:
#PoDoSo挑料送WMS
dnIssueListToWMS:
#出退货还原
revoke:
#智能仓库存查询
queryIwInventory:
#查询所有库存标签码信息
queryInvLabelId:
#单据备料还原
ticketRevert:
#校验箱号信息
validCarton: http://10.68.30.22:8082/api/mlb/ValidCarton
#获取栈板信息
fetchPalletInfo: http://10.68.30.22:8082/api/mlb/FetchPalletInfo
#栈板同库别转移
palletUpdate: http://10.68.30.22:8082/api/mlb/PalletUpdate
#获取可用库存
fetchValidInv: http://10.68.30.22:8082/api/wcs/FetchValidInv
#栈板拆分
palletSplit: http://10.68.30.22:8082/api/wcs/PalletSplit
#栈板合并
palletMerge: http://10.68.30.22:8082/api/wcs/PalletMerge
#箱去向接口
cartonDst: http://10.68.30.22:8082/api/wcs/CartonDst
#挑料完成绑定栈板
bindPallet:
#挑料批量绑定栈板
bindPalletBulk:
#取消绑定栈板
unBindPallet:
#拉取转库单据
fetchMoveTicket: http://10.68.30.22:8082/api/wcs/FetchMoveTicket
#转库单据备料
moveTicketPick: http://10.68.30.22:8082/api/wcs/MoveTicketPick
#转库单据过账
moveTicketPost: http://10.68.30.22:8082/api/wcs/MoveTicketPost
#Check检查站
checkPassStation: http://10.68.30.22:8082/api/wcs/CheckPassStation
#PPS CHECK检查结果
checkLabelResult: http://10.68.30.22:8082/api/wcs/CheckLabelResult
#集货单锁定料箱查询
lockedCartonQuery: http://10.68.30.22:8082/api/wcs/LockedCartonQuery
#用栈板号获取箱信息清单
fetchPalletCarton: http://10.68.30.22:8082/api/wcs/FetchPalletCarton
#PPS 按栈板获取箱清单
checkPalletCarton: http://10.68.30.22:8082/api/wcs/CheckPalletCarton
#获取不可用(HOLD)库存信息
fetchHoldInfo: http://10.68.30.22:8082/api/wcs/FetchHoldInfo
#激活预分车任务信息
activeTruck:
#转库单据备料还原
moveTicketRestore: http://10.68.30.22:8082/api/wcs/MoveTicketRestore
#重置转库单据
resetMoveTicket: http://10.68.30.22:8082/api/wcs/ResetMoveTicket
#查询挑料单列表
queryPicking: http://10.68.30.22:8082/api/mlb/QueryPicking
#获取挑料单详情
getPickingItems: http://10.68.30.22:8082/api/mlb/GetPickingItems
#获取尺寸信息
brandQtyUrl: http://10.68.30.22:8082/api/wcs/brandQty
#自动仓获取ODN单信息
fetchShipmentInfo: http://10.68.30.22:8082/api/FetchShipment
#储位转移
binMove: http://10.68.30.22:8082/api/mlb/BinMove
#砍单回库
shipCancelUpshelf: http://10.68.30.22:8082/api/mlb/ShipCancelUpshelf
\ No newline at end of file \ No newline at end of file
src/main/resources/config/application-21088test.yml deleted 100644 → 0
#厂区名称
luxsan:
plantCode: W339
#C区配置文件
api:
name: luxsan
cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn
#禁用料
inCheckUrl: http://10.68.21.21:8001/Npm/WmsCheckReelfob
#储位查询
queryBin: http://10.42.220.171:8082/api/mlb/QueryBin
#更新储位
updateBin: http://10.42.220.171:8082/api/mlb/UpdateBin
#GR查询
queryGr: http://10.42.220.171:8082/api/mlb/QueryGR
#校验DC有效期
getInDate: http://10.42.220.171:8082/api/mes/GetInDate
#GR过账状态查询
queryGrStatus: http://10.42.220.171:8082/api/mlb/QueryGrStatus
#按GR生成标签码并上架
newLabelToCell: http://10.42.220.171:8082/api/mlb/NewLabelToCell
#电子料入退库
backToWarehouse: http://10.42.220.171:8082/api/mlb/BackToWarehouse
#Tower发料
towerIssue: http://10.42.220.171:8082/api/mlb/TowerIssue;
#pk发料
pickingIssue: http://10.42.220.171:8082/api/mlb/PickingIssue
#料卷退PK
returnToPK: http://10.42.220.171:8082/api/mlb/ReturnToPK
#单据挑料
ticketPost: http://10.42.220.171:8082/api/mlb/TicketPost
#拆分标签码
splitLabelID:
#合并标签码
mergeLabelID:
#单据产生标签码
getLabelByTicket:
#标签码信息查询
queryLabelID:
#标签码上架
labelUpToShelf:
#PoDoSo挑料送WMS
dnIssueListToWMS:
#出退货还原
revoke:
#智能仓库存查询
queryIwInventory:
#查询所有库存标签码信息
queryInvLabelId:
#单据备料还原
ticketRevert:
#校验箱号信息
validCarton: http://10.42.220.171:8082/api/mlb/ValidCarton
#获取栈板信息
fetchPalletInfo: http://10.42.220.171:8082/api/mlb/FetchPalletInfo
#栈板同库别转移
palletUpdate: http://10.42.220.171:8082/api/mlb/PalletUpdate
#获取可用库存
fetchValidInv: http://10.42.220.171:8082/api/wcs/FetchValidInv
#栈板拆分
palletSplit: http://10.42.220.171:8082/api/wcs/PalletSplit
#栈板合并
palletMerge: http://10.42.220.171:8082/api/wcs/PalletMerge
#箱去向接口
cartonDst: http://10.42.220.171:8082/api/wcs/CartonDst
#挑料完成绑定栈板
bindPallet:
#挑料批量绑定栈板
bindPalletBulk:
#取消绑定栈板
unBindPallet:
#拉取转库单据
fetchMoveTicket: http://10.42.220.171:8082/api/wcs/FetchMoveTicket
#转库单据备料
moveTicketPick: http://10.42.220.171:8082/api/wcs/MoveTicketPic
#转库单据过账
moveTicketPost: http://10.42.220.171:8082/api/wcs/MoveTicketPost
#Check检查站
checkPassStation: http://10.42.220.171:8082/api/wcs/CheckPassStation
#PPS CHECK检查结果
checkLabelResult: http://10.42.220.171:8082/api/wcs/CheckLabelResult
#集货单锁定料箱查询
lockedCartonQuery: http://10.42.220.171:8082/api/wcs/LockedCartonQuery
#用栈板号获取箱信息清单
fetchPalletCarton: http://10.42.220.171:8082/api/wcs/FetchPalletCarton
#PPS 按栈板获取箱清单
checkPalletCarton: http://10.42.220.171:8082/api/wcs/CheckPalletCarton
#获取不可用(HOLD)库存信息
fetchHoldInfo: http://10.42.220.171:8082/api/wcs/FetchHoldInfo
#激活预分车任务信息
activeTruck:
#转库单据备料还原
moveTicketRestore: http://10.42.220.171:8082/api/wcs/MoveTicketRestore
#重置转库单据
resetMoveTicket: http://10.42.220.171:8082/api/wcs/ResetMoveTicket
#查询挑料单列表
queryPicking: http://10.42.220.171:8082/api/mlb/QueryPicking
#获取挑料单详情
getPickingItems: http://10.42.220.171:8082/api/mlb/GetPickingItems
#获取尺寸信息
brandQtyUrl: http://10.42.220.171:8082/api/mlb/brandQty
#自动仓获取ODN单信息
fetchShipmentInfo: http://10.42.220.171:8082/api/FetchShipment
#储位转移
binMove: http://10.42.220.171:8082/api/mlb/BinMove
#砍单回库
shipCancelUpshelf: http://10.42.220.171:8082/api/mlb/ShipCancelUpshelf
#备品仓入库单号查询接口
getSpareNo: http://10.42.220.118:8108/iams-api/getSpareNo
#备品仓入库接口
spareInhourse: http://10.42.220.118:8108/iams-api/spareInhourse
#预约待领取接口
getUnclaimed: http://10.42.220.118:8108/iams-api/getUnclaimed
#备品仓退库查询接口
getReturnInventory: http://10.42.220.118:8108/iams-api/getReturnInventory
src/main/resources/config/application-apiprod.yml 0 → 100644
api:
name: Luxsan_sp
getSpareNo: https://iamsapi.luxsan-ict.com/iams-api/getSpareNo
\ No newline at end of file \ No newline at end of file
src/main/resources/config/application-apitest.yml 0 → 100644
api:
name: Luxsan_sp
getSpareNo: http://10.42.220.118:8108/iams-api/getSpareNo
\ No newline at end of file \ No newline at end of file
src/main/resources/config/application.yml
...@@ -2,67 +2,67 @@ server: ...@@ -2,67 +2,67 @@ server:
port: 8800 port: 8800
api: api:
name: #Lizhen name:
inCheckUrl: #http://10.190.25.124:8001/Npm/WmsCheckReelfob #禁用料 inCheckUrl:
batchCheckUrl: #http://172.30.60.117:8001/Npm/WmsCheckReelfob_Batch #批量禁用料 batchCheckUrl:
outNotifyUrl: #http://172.30.170.148:8082/SmtAutoWH/Save2DReelInfo #保存物料(外仓配置) outNotifyUrl:
outNotifyUrlPK: #http://172.30.170.148:8001/Sct/SaveReelInfo #PK发料保存(外仓配置) outNotifyUrlPK:
inNotifyUrl: #http://10.190.25.124:8082/SmtAutoWH/Save2DReelInfo #保存物料(内仓配置) inNotifyUrl:
fetchOrderUrl: #http://172.30.170.148:8082/SmtAutoWH/GetWoPickingList #获取工单 fetchOrderUrl:
barcodeInfoUrl: #http://10.190.25.124:8001/Sct/GetReelInfo #mes数量 barcodeInfoUrl:
fetchGRUrl: #http://10.42.25.199:8082/api/wcs/fetchGR #gr标签 fetchGRUrl:
brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数 brandQtyUrl:
importUrl: #http://10.42.222.52:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据 importUrl:
checkReelMeasure: #http://10.190.25.124:8001/Sct/CheckReelMeasure #散料量测接口 checkReelMeasure:
plant: #2810 plant:
werks: #2810 werks:
outerFactory: outerFactory:
bc: bc:
plant: #2810 plant:
factory: #B3 factory:
#缺料预警对应的地址 #缺料预警对应的地址
lizhen: lizhen:
F2: F2:
name: #2F name:
line: #A05-2FSMT-16S,A05-2FSMT-17S,A05-2FSMT-06S,A05-2FSMT-07S line:
url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial url:
F3: F3:
name: 3F name:
line: line:
url: http://10.68.27.85/smf-core/wcs/machineCallMaterial url:
F5: F5:
name: #5F name:
line: #A05-5FSMT-13S,A05-5FSMT-03S,A05-5FSMT-02S,A05-5FSMT-12S #,A05-5FARF-06,A05-5FSMT-01S,A05-5FSMT-11S line:
url: #http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial url:
F4: F4:
name: #4F name:
line: #B03-4FSMT-11,B03-4FSMT-01,B03-4FSMT-13,B03-4FSMT-03,B03-4FSMT-14,B03-4FSMT-04 line:
url: #http://172.25.252.12:8001/smf-core/api/Mes/machineCallMaterial url:
manual: manual:
url: http://10.68.27.85/smf-core/wcs/manualTower url:
# #
#转发地址 #转发地址
forward: forward:
f2: f2:
name: #2F name:
url: #http://172.30.88.19:8001/smf-core url:
f3: f3:
name: #3F name:
url: #http://172.30.97.99:8001/smf-core url:
f5: f5:
name: #5F name:
url: #http://172.30.97.63:8001/smf-core url:
b15: b15:
name: #B15 name:
url: #http://10.42.176.209:8001/smf-core url:
f4: f4:
name: #4F name:
url: #http://127.0.0.1:8800 url:
#手动出库料箱 #手动出库料箱
manualcheckout: manualcheckout:
...@@ -82,7 +82,7 @@ spring: ...@@ -82,7 +82,7 @@ spring:
check-template-location: false check-template-location: false
profiles: profiles:
active: 'prod' active: 'prod'
include: 21088test include: apitest
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:
...@@ -105,6 +105,5 @@ app: ...@@ -105,6 +105,5 @@ app:
type: "" type: ""
menu: menu:
#show: grStorage,pkStorage,storageTransfer,docMaterialRe,docTransferWarehous,docReturn,manualWarehous show:
show: #manualWork,requisition,Shipment,transferInventory
hide: hide:
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!