Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 211a0cdc 由 sunke
选项

1 亮灯灭灯慢的问题 

2 第一盘料没感应到又扫了第二盘物料时,取消第一盘料的入库任务
1 个父辈 c7bd53b4
内嵌 并排
正在显示 7 个修改的文件 包含 363 行增加 和 318 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java
...@@ -141,240 +141,244 @@ public class NLPShelfHandler extends BaseDeviceHandler{ ...@@ -141,240 +141,244 @@ public class NLPShelfHandler extends BaseDeviceHandler{
if(storage == null){ if(storage == null){
return ResultBean.newErrorResult(-1,"smfcore.shelfNotExist", "{0}对应的料架不存在",new String[]{cid} ); return ResultBean.newErrorResult(-1,"smfcore.shelfNotExist", "{0}对应的料架不存在",new String[]{cid} );
} }
String groupId = storage.getGroupId(); synchronized(storage){
if(groupId.equals("")){ //实际信号有料,数据库无信息
groupId="-1"; String[] hasReelPosErrorList = request.getParameterValues("hasReelPosErrorList");
} //实际信号无料，数据库有信息
String[] hasReelPosList = request.getParameterValues("hasReelPosList"); String[] noReelPosErrorList = request.getParameterValues("noReelPosErrorList");
String[] noReelPosList = request.getParameterValues("noReelPosList"); if(hasReelPosErrorList==null){
hasReelPosErrorList=new String[]{};
}
String[] hasReelPosErrorList = request.getParameterValues("hasReelPosErrorList");//实际信号有料,数据库无信息 if(noReelPosErrorList==null) {
String[] noReelPosErrorList = request.getParameterValues("noReelPosErrorList");//实际信号无料，数据库有信息 noReelPosErrorList = new String[]{};
if(hasReelPosErrorList==null){
hasReelPosErrorList=new String[]{};
}
if(noReelPosErrorList==null) {
noReelPosErrorList = new String[]{};
}
List<String> ngToOk=new ArrayList<>();
//数据库有信息，实际无料
if(noReelPosErrorList.length>0){
//log.info("开始检测noReelPosErrorList");
Query query=new Query(Criteria.where("posName").in(noReelPosErrorList));
List<StoragePos> posList= storagePosManager.findByQuery(query);
for (StoragePos pos:posList) {
if(!pos.isUsed()){
ngToOk.add(pos.getPosName());
log.info("sensorChange 客户端上传 noReelPosErrorList 库位["+pos.getPosName()+"]数据库无信息，放入ngToOk");
}
} }
}
List<List<String>> data=new ArrayList<>(); List<String> usedPosNameList = dataCache.getUsedPosNameList(storage.getCid());
data.add(Arrays.asList(hasReelPosErrorList) ); List<String> ngToOk=new ArrayList<>();
data.add(Arrays.asList(noReelPosErrorList)); //数据库有信息，实际无料
DevicesStatusUtil.updateDeviceData(cid,data); if(noReelPosErrorList.length>0){
//log.info("开始检测noReelPosErrorList");
List<String> inOkList = new ArrayList<>(); for (String noReelPosName : noReelPosErrorList) {
List<String> inNgList = new ArrayList<>(); if(usedPosNameList.contains(noReelPosName)){
List<String> outOkList = new ArrayList<>(); ngToOk.add(noReelPosName);
List<String> outNgList = new ArrayList<>(); log.info("sensorChange 客户端上传 noReelPosErrorList 库位["+noReelPosName+"]数据库无物料，放入ngToOk");
}
if(hasReelPosList != null){
log.info("开始检测hasReelPosList");
List<String> newList=new ArrayList<>();
for (String posName : hasReelPosList) {
StoragePos pos = storagePosManager.getByPosName(posName);
if(pos==null) {
log.info("sensorChange 未找到库位 hasReelPosList [" + posName + "]");
continue;
}
if(!pos.isEnabled()){
continue;
} }
newList.add(posName);
} }
hasReelPosList=newList.toArray(new String[newList.size()]); List<List<String>> data=new ArrayList<>();
data.add(Arrays.asList(hasReelPosErrorList) );
data.add(Arrays.asList(noReelPosErrorList));
DevicesStatusUtil.updateDeviceData(cid,data);
List<String> inOkList = new ArrayList<>();
List<String> inNgList = new ArrayList<>();
List<String> outOkList = new ArrayList<>();
List<String> outNgList = new ArrayList<>();
String[] hasReelPosList = request.getParameterValues("hasReelPosList");
if(hasReelPosList != null){
log.info("开始检测hasReelPosList");
Set<String> disabledPosNameSet = dataCache.getDisabledPosNameSet();
List<String> newList=new ArrayList<>();
for (String posName : hasReelPosList) {
if(disabledPosNameSet.contains(posName)){
log.info("sensorChange hasReelPosList [" + posName + "]库位被禁用,忽略");
continue;
}
newList.add(posName);
}
//入库的库位列表 hasReelPosList=newList.toArray(new String[newList.size()]);
if(hasReelPosList.length > 1){
String msg = "不可同时放入多盘物料:"+ String.join(",",hasReelPosList);
log.error(msg);
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId());
SocketMsg socketMsg = new SocketMsg(notifyUsers, msg, MsgType.ERROR,"smfclient.nlp.onlyOneTray",new String[]{String.join(",",hasReelPosList)});
WebSocketServer.sendMsg("",socketMsg); //入库的库位列表
for (String posStr : hasReelPosList) { if(hasReelPosList.length > 1){
inNgList.add(posStr); String msg = "不可同时放入多盘物料:"+ String.join(",",hasReelPosList);
}
}else if (hasReelPosList.length==1){
log.info("开始检测执行入库");
StoragePos pos = storagePosManager.getByPosName(hasReelPosList[0]);
if(pos == null){
String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
log.error(msg); log.error(msg);
for (String posStr : hasReelPosList) {
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId()); inNgList.add(posStr);
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers,msg, MsgType.ERROR,"smfclient.nlp.cannotFindPos",new String[]{"",String.join(",",hasReelPosList)})); }
}else if (hasReelPosList.length==1){
log.info("开始检测执行入库");
StoragePos pos = storagePosManager.getByPosName(hasReelPosList[0]);
if(pos == null){
String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
log.error(msg);
}
else if(!pos.getStorageId().equals(storage.getId())){
String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ;
log.error(msg);
}
//如果库位有料，直接结束
else if(pos.getBarcode()!=null) {
log.info("料架[" + cid + "]入库库位[" + pos.getPosName() + "]已有料： [" + pos.getBarcode().getBarcode() + "]");
}
else{
boolean posInResult = handlePosIn(storage,pos);
if(posInResult){
inOkList.add(pos.getPosName());
}else{
inNgList.add(pos.getPosName());
}
}
} }
else if(!pos.getStorageId().equals(storage.getId())){ }
String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ;
log.error(msg);
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId()); String[] noReelPosList = request.getParameterValues("noReelPosList");
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers, msg, MsgType.ERROR,"smfclient.nlp.cannotFindPos",new String[]{storage.getName(),String.join(",",hasReelPosList)})); if(noReelPosList != null){
} //出库
//如果库位有料，直接结束 log.info("出库检测noReelPosList");
else if(pos.getBarcode()!=null) { for (String noReelPosName : noReelPosList) {
log.info("料架[" + cid + "]入库库位[" + pos.getPosName() + "]已有料： [" + pos.getBarcode().getBarcode() + "]"); boolean handleNoReelPosResult = handleNoReelPos(storage,usedPosNameList,noReelPosName);
if(handleNoReelPosResult){
outOkList.add(noReelPosName);
}else{
outNgList.add(noReelPosName);
}
} }
else{ }
Collection<DataLog> queueTasks = taskService.getQueueTasks();
for (DataLog queueTask : queueTasks) {
boolean isPutInTask=false;
if(ObjectUtil.isNotEmpty(queueTask.getStorageId()) ){
if(queueTask.isPutInTask()&&queueTask.getStorageId().equals(storage.getId())){
isPutInTask=true;
}
}
else if(queueTask.isPutInTask() && queueTask.getGroupId().equals(groupId)) {
isPutInTask = true;
}
if(isPutInTask) {
queueTask.setCid(cid);
queueTask.setPosId(pos.getId());
queueTask.setPosName(pos.getPosName());
queueTask.setStorageId(storage.getId());
queueTask.setStorageName(storage.getName());
try {
//入库完成,发送入库完成请求
log.info("入库完成,发送入库完成请求");
super.finishedPutIn(cid, pos.getPosName());
inOkList.add(hasReelPosList[0]);
String msg = queueTask.getBarcode() + "入库到" + pos.getPosName() + "成功";
log.info(msg);
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId()); Map<String,List<String>> dataMap = new HashMap<>();
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers, msg, MsgType.INFO,"smfclient.nlp.inputOk",new String[]{queueTask.getBarcode(),pos.getPosName()})); dataMap.put("inOkList",inOkList);
dataMap.put("inNgList",inNgList);
dataMap.put("outOkList",outOkList);
dataMap.put("outNgList",outNgList);
dataMap.put("ngToOk",ngToOk);
return ResultBean.newOkResult(dataMap);
}
try {
//判断是否是入库单入库
if (queueTask.getInType() == 5) {
log.info("入库单入库");
Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
InListItem item = inListCache.UpdateInList(queueTask.getSourceName(), pos, barcode);
if (item != null) { }
InList inList = inListCache.getInList(queueTask.getSourceName());
//入库完成，调用 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 { /**
* 处理库位入库
* @param storage
* @param pos
* @return
*/
private boolean handlePosIn(Storage storage, StoragePos pos){
String groupId = storage.getGroupId();
if(groupId.equals("")){
groupId="-1";
}
log.info("调用 7.5入库上架过账接口"); Collection<DataLog> queueTasks = taskService.getQueueTasks();
//入库完成，调用 7.5入库上架过账接口 for (DataLog queueTask : queueTasks) {
boolean result = HikApi.putInApi(queueTask.getOperator(), InOutApiInfo.inputInfo(queueTask.getInType(), queueTask.getBarcode(), queueTask.getNum())); boolean isPutInTask=false;
if(ObjectUtil.isNotEmpty(queueTask.getStorageId()) ){
if(queueTask.isPutInTask()&&queueTask.getStorageId().equals(storage.getId())){
isPutInTask=true;
}
}
else if(queueTask.isPutInTask() && queueTask.getGroupId().equals(groupId)) {
isPutInTask = true;
}
boolean inResult = false;
if(isPutInTask) {
queueTask.setCid(storage.getCid());
queueTask.setPosId(pos.getId());
queueTask.setPosName(pos.getPosName());
queueTask.setStorageId(storage.getId());
queueTask.setStorageName(storage.getName());
try {
//入库完成,发送入库完成请求
log.info("入库完成,发送入库完成请求");
super.finishedPutIn(storage.getCid(), pos.getPosName());
String msg = queueTask.getBarcode() + "入库到" + pos.getPosName() + "成功";
log.info(msg);
inResult = true;
try {
//判断是否是入库单入库
if (queueTask.getInType() == 5) {
log.info("入库单入库");
Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
InListItem item = inListCache.UpdateInList(queueTask.getSourceName(), pos, barcode);
if (item != null) {
InList inList = inListCache.getInList(queueTask.getSourceName());
//入库完成，调用 7.2转储单入库过账接口
TransferOrderInInfo inInfo = new TransferOrderInInfo(inList.getName(), inList.getDocType(), queueTask.getBarcode(), item.getBaseCode(), item.getInLgort(), queueTask.getNum());
HikApi.transferOrderInApi(queueTask.getOperator(), inInfo);
}
} } else {
} catch (Exception e) { log.info("调用 7.5入库上架过账接口");
log.error("入库完成接口处理报错：", e); //入库完成，调用 7.5入库上架过账接口
return ResultBean.newErrorResult(-1, "smfcore.inputError", "入库出错:{0}", new String[]{e.getMessage()}); HikApi.putInApi(queueTask.getOperator(), InOutApiInfo.inputInfo(queueTask.getInType(), queueTask.getBarcode(), queueTask.getNum()));
}
break;
} catch (Exception e) {
log.error("入库完成处理出错：", e);
return ResultBean.newErrorResult(-1, "smfcore.inputError", "入库出错:{0}", new String[]{e.getMessage()});
}
} }
} catch (Exception e) {
log.error("入库完成接口处理报错：", e);
} }
if(inOkList.size() == 0){ } catch (Exception e) {
inNgList.add(hasReelPosList[0]); log.error("入库完成处理出错：", e);
log.error("未找到["+pos.getPosName()+"]的入库任务");
}
} }
return inResult;
} }
} }
if(noReelPosList != null){ log.error("未找到["+pos.getPosName()+"]的入库任务");
//出库 return false;
}
log.info("出库检测noReelPosList");
for (String posName : noReelPosList) {
StoragePos pos = storagePosManager.getByPosName(posName);
if(pos==null){
log.info("sensorChange 未找到库位 noReelPosList ["+posName+"]");
continue;
}
if(!pos.isEnabled()){
continue;
}
if(pos == null){
String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
log.error(msg);
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId()); /**
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers, msg, MsgType.ERROR,"smfclient.nlp.cannotFindPos",new String[]{"",String.join(",",hasReelPosList)})); * 处理客户端发上来的无料库位
} * @param storage
else if(!pos.getStorageId().equals(storage.getId())){ * @param usedPosNameList
String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ; * @param noReelPosName
* @return
*/
private boolean handleNoReelPos(Storage storage, List<String> usedPosNameList, String noReelPosName){
boolean handleResult = false;
if(!usedPosNameList.contains(noReelPosName)){
log.info("库位: "+noReelPosName+" 中数据库中已无物料信息,加入outOkList");
handleResult = true;
}else{
StoragePos pos = storagePosManager.getByPosName(noReelPosName);
if(pos==null){
log.error("sensorChange 未找到库位 noReelPosList ["+noReelPosName+"],加入outOkList");
handleResult = true;
}else{
if(!pos.isEnabled()){
log.error("sensorChange noReelPosList ["+noReelPosName+"]已禁用,加入outOkList");
handleResult = true;
}else if(!pos.getStorageId().equals(storage.getId())){
String msg = "["+storage.getName()+"]未找到库位:"+ noReelPosName+",加入outOkList";
log.error(msg); log.error(msg);
handleResult = true;
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId());
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers, msg, MsgType.ERROR,"smfclient.nlp.cannotFindPos",new String[]{storage.getName(),String.join(",",hasReelPosList)}));
}else if(pos.getBarcode()==null){ }else if(pos.getBarcode()==null){
log.info("料架[" + cid + "]出库库位[" + pos.getPosName() + "]已为空 "); log.info("库位: "+noReelPosName+" 数据库中已无物料信息,加入outOkList");
handleResult = true;
}else{ }else{
String outResult = "";
Collection<DataLog> queueTasks = taskService.getQueueTasks(); Collection<DataLog> queueTasks = taskService.getQueueTasks();
String outResult = "";
for (DataLog queueTask : queueTasks) { for (DataLog queueTask : queueTasks) {
if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(posName)){ if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(noReelPosName)){
//出库完成 //出库完成
try { try {
outResult = noReelPosName;
outResult = posName; super.finishedOutPos(storage.getCid(),noReelPosName);
super.finishedOutPos(cid,posName); String msg = queueTask.getBarcode()+ "从"+ noReelPosName+"出库成功";
String msg = queueTask.getBarcode()+ "从"+ posName+"出库成功，颜色["+queueTask.getLightColor()+"]";
log.info(msg); log.info(msg);
List<String> notifyUsers = userManager.findByDeviceGroupId(storage.getGroupId());
WebSocketServer.sendMsg("",new SocketMsg(notifyUsers, msg, MsgType.INFO,"smfclient.nlp.outputOk",new String[]{queueTask.getBarcode(),posName}));
break; break;
} catch (Exception e) { } catch (Exception e) {
log.error("出库出错",e); log.error("库位:" + noReelPosName+"出库出错",e);
return ResultBean.newErrorResult(-1,"smfcore.checkoutError","出库出错:{0}" ,new String[]{ e.getMessage()}); break;
} }
} }
} }
if(outResult.isEmpty()){ if(outResult.isEmpty()){
outNgList.add(posName); handleResult = false;
String msg = "未找到["+posName+"]的出库任务"; String msg = "未找到["+noReelPosName+"]的出库任务";
log.error(msg); log.error(msg);
//WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR,"smfclient.nlp.noOutTask",new String[]{posName,storage.getName()})); //WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR,"smfclient.nlp.noOutTask",new String[]{posName,storage.getName()}));
}else{ }else{
outOkList.add(outResult); handleResult = true;
} }
} }
} }
} }
return handleResult;
Map<String,List<String>> dataMap = new HashMap<>();
dataMap.put("inOkList",inOkList);
dataMap.put("inNgList",inNgList);
dataMap.put("outOkList",outOkList);
dataMap.put("outNgList",outNgList);
dataMap.put("ngToOk",ngToOk);
return ResultBean.newOkResult(dataMap);
} }
/** /**
* 获取料架的库位占用及出库任务 * 获取料架的库位占用及出库任务
*/ */
......
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
...@@ -394,6 +394,7 @@ public class DeviceController { ...@@ -394,6 +394,7 @@ public class DeviceController {
} }
pos.setEnabled(false); pos.setEnabled(false);
storagePosManager.save(pos); storagePosManager.save(pos);
dataCache.updateDisablePos(pos);
log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]"); log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
DeviceMessageUtil.addEnabledPosMessage(pos,""); DeviceMessageUtil.addEnabledPosMessage(pos,"");
......
src/main/java/com/neotel/smfcore/core/device/util/DataCache.java
...@@ -64,6 +64,11 @@ public class DataCache { ...@@ -64,6 +64,11 @@ public class DataCache {
* 库位占用Map, key为cid,value为已使用的库位列表 * 库位占用Map, key为cid,value为已使用的库位列表
*/ */
private static Map<String, List<String>> usedPosNameMap = new ConcurrentHashMap<>(); private static Map<String, List<String>> usedPosNameMap = new ConcurrentHashMap<>();
/**
* 禁用库位名称列表
*/
private static Set<String> disabledPosNameSet;
/** /**
* 所有的料仓 key 为 cid, value 为 Storage * 所有的料仓 key 为 cid, value 为 Storage
*/ */
...@@ -470,6 +475,39 @@ public class DataCache { ...@@ -470,6 +475,39 @@ public class DataCache {
return storageInventory; return storageInventory;
} }
/**
* 获取禁用库位缓存
*/
public Set<String> getDisabledPosNameSet(){
initDisabledPosNameSet();
return disabledPosNameSet;
}
/**
* 初始化禁用库位缓存
*/
private synchronized void initDisabledPosNameSet(){
if(disabledPosNameSet == null){
disabledPosNameSet = new HashSet<>();
List<StoragePos> disabledPosList = storagePosManager.findDisabled();
for (StoragePos disabledPos : disabledPosList) {
disabledPosNameSet.add(disabledPos.getPosName());
}
log.info("加载禁用库位缓存,共" + disabledPosNameSet.size() + "个");
}
}
/**
* 更新禁用库位缓存
*/
public void updateDisablePos(StoragePos pos){
initDisabledPosNameSet();
if(pos.isEnabled()){
disabledPosNameSet.remove(pos.getPosName());
}else{
disabledPosNameSet.add(pos.getPosName());
}
}
/** /**
* 出库时清除使用库位列表 * 出库时清除使用库位列表
...@@ -492,9 +530,9 @@ public class DataCache { ...@@ -492,9 +530,9 @@ public class DataCache {
/** /**
* 获取设备所有占用的库位名称列表 * 获取设备所有占用的库位名称列表
*/ */
public List<String> getUsedPosNameList(String cid) { public synchronized List<String> getUsedPosNameList(String cid) {
if(cid == null){ if(cid == null || cid.isEmpty()){
cid = ""; return new ArrayList<>();
} }
List<String> posNameList = usedPosNameMap.get(cid); List<String> posNameList = usedPosNameMap.get(cid);
if (posNameList == null) { if (posNameList == null) {
......
src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java
...@@ -183,161 +183,155 @@ public class SingleInController { ...@@ -183,161 +183,155 @@ public class SingleInController {
if (ObjectUtils.isEmpty(code)) { if (ObjectUtils.isEmpty(code)) {
throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"}); throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
} }
Storage storage = storageManager.get(storageId); Storage storage = dataCache.getStorageById(storageId);
if (storage == null) { if (storage == null) {
return ResultBean.newErrorResult(-1, "smfcore.shelfNotExist", "{0}对应的料架不存在", new String[]{storageId}); return ResultBean.newErrorResult(-1, "smfcore.shelfNotExist", "{0}对应的料架不存在", new String[]{storageId});
} }
// log.info("codeInProcess , code["+code+"],storageId["+storageId+"]开始验证是否有未结束的任务"); synchronized (storage){
// WebSocketServer.sendMsg("", new SocketMsg("{0}未找到库位:{1}"+code, MsgType.INFO,"smfclient.nlp.cannotFindPos",new String[]{"消息测试","库位号"})); // log.info("codeInProcess , code["+code+"],storageId["+storageId+"]开始验证是否有未结束的任务");
String loginUser = SecurityUtils.getLoginUsername(); // WebSocketServer.sendMsg("", new SocketMsg("{0}未找到库位:{1}"+code, MsgType.INFO,"smfclient.nlp.cannotFindPos",new String[]{"消息测试","库位号"}));
Collection<DataLog> queueTasks = taskService.getQueueTasks(); String loginUser = SecurityUtils.getLoginUsername();
ResultBean resultBean = null; Collection<DataLog> queueTasks = taskService.getQueueTasks();
for (DataLog queueTask : queueTasks) { ResultBean resultBean = null;
for (DataLog queueTask : queueTasks) {
// log.info("------codeInProcess queueTask="+ JsonUtil.toJsonStr(queueTask)); // log.info("------codeInProcess queueTask="+ JsonUtil.toJsonStr(queueTask));
if (queueTask.isPutInTask() &&(queueTask.isWait()||queueTask.isExecuting()) ) { if (queueTask.isPutInTask() &&(queueTask.isWait()||queueTask.isExecuting()) ) {
if (!Strings.isNullOrEmpty(storageId) && queueTask.getStorageId().equals(storageId)) { if (!Strings.isNullOrEmpty(storageId) && queueTask.getStorageId().equals(storageId)) {
log.info("codeIn [" + code + "][" + storageId + "]入库失败:条码[" + queueTask.getBarcode() + "]的任务还未结束 "); log.warn("扫描条码["+code+"]时取消物料["+queueTask.getBarcode()+"]未完成的入库任务");
throw new ValidateException("smfcore.unfinished", "the task of [{0}] is unfinished", new String[]{queueTask.getBarcode()}); taskService.cancelTask(queueTask.getId());
// log.info("codeIn [" + code + "][" + storageId + "]入库失败:条码[" + queueTask.getBarcode() + "]的任务还未结束 ");
// throw new ValidateException("smfcore.unfinished", "the task of [{0}] is unfinished", new String[]{queueTask.getBarcode()});
}
} }
} }
}
Barcode barcode = resolveBarcode(code); Barcode barcode = resolveBarcode(code);
StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode()); StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
if (pos != null) { if (pos != null) {
throw new ValidateException("smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{pos.getPosName()}); throw new ValidateException("smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{pos.getPosName()});
}
for (DataLog queueTask : queueTasks) {
if (queueTask.getBarcode()!=null&&queueTask.getBarcode().equals(barcode.getBarcode())) {
log.info("codeIn [" + code + "][" + storageId + "]入库失败:条码[" + queueTask.getBarcode() + "]在料仓["+queueTask.getStorageName()+"]已有入库任务 ");
throw new ValidateException("smfcore.barcode.unfinished", "条码["+queueTask.getBarcode()+"]在料仓["+queueTask.getStorageName()+"]已有入库任务",
new String[]{queueTask.getBarcode(),queueTask.getStorageName()});
} }
} for (DataLog queueTask : queueTasks) {
//判断料架是否有空位 if (queueTask.getBarcode()!=null&&queueTask.getBarcode().equals(barcode.getBarcode())) {
for (UsageItem item : storage.getUsageMap().values()) { log.warn("扫描条码["+code+"]时取消["+queueTask.getBarcode()+"]未完成的入库任务");
if (item.getH() == barcode.getHeight() && item.getW() == barcode.getPlateSize()) { taskService.cancelTask(queueTask.getId());
int emptyCount = item.getTotalCount() - item.getUsedCount();
if(emptyCount<=0){
log.info("codeIn [" + code + "][" + storageId + "]入库失败:"+barcode.getPlateSize()+"X"+barcode.getHeight()+"未找到可用库位 ");
throw new ValidateException("smfcore.noValidPos", "未找到可用仓位");
} }
} }
}
//线边间转储入库和退料入库需要获取数量 //线边间转储入库和退料入库需要获取数量
boolean needGetQty = false; boolean needGetQty = false;
//01 退料 02 线边仓间入库 //01 退料 02 线边仓间入库
String businessType = ""; String businessType = "";
String businessNo = ""; String businessNo = "";
//存储入库需要先验证入库单 //存储入库需要先验证入库单
if(inType.equals(5)) { if(inType.equals(5)) {
if(ObjectUtil.isEmpty(docName)){ if(ObjectUtil.isEmpty(docName)){
throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"docName"}); throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"docName"});
} }
InList inList = inListCache.getInList(docName); InList inList = inListCache.getInList(docName);
if(inList != null){ if(inList != null){
if(inList.getDocType() == 4){ if(inList.getDocType() == 4){
//线边仓间入库 //线边仓间入库
businessType = "02"; businessType = "02";
businessNo = docName; businessNo = docName;
}
} }
}
if(inType.equals(4)){
//退料入库
businessType = "01";
} }
} //判断如果是退料入库，需要获取数量
if(inType.equals(4)){ if (!businessType.isEmpty()) {
//退料入库 int num = HikApi.returnMaterialApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(),businessType,businessNo);
businessType = "01"; if (num > 0) {
} barcode.setAmount(num);
barcodeManager.saveBarcode(barcode);
log.info("入库二维码 " + barcode.getBarcode() + " 从接口获得新数量：" + num + "，并更新");
} else {
throw new ValidateException("smfcore.returnMaterialApi.error", "入库：[" + barcode.getBarcode() + "]获取数量失败");
}
if(inType.equals(5)) {
//入库单验证
resultBean = inListCache.inListValidate(docName, barcode.getPartNumber(),barcode.getAmount());
if (!resultBean.isOkResult()) {
return resultBean;
}
}
//判断如果是退料入库，需要获取数量
if (!businessType.isEmpty()) {
int num = HikApi.returnMaterialApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(),businessType,businessNo);
if (num > 0) {
barcode.setAmount(num);
barcodeManager.saveBarcode(barcode);
log.info("入库二维码 " + barcode.getBarcode() + " 从接口获得新数量：" + num + "，并更新");
} else { } else {
throw new ValidateException("smfcore.returnMaterialApi.error", "入库：[" + barcode.getBarcode() + "]获取数量失败"); //唯一码校验接口
} ResponseParam param = HikApi.riCheckApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(), "", "");
if(inType.equals(5)) {
//入库单验证 if (ObjectUtil.isNotEmpty(param)) {
resultBean = inListCache.inListValidate(docName, barcode.getPartNumber(),barcode.getAmount()); if (param.getCode().equals(HikApi.CODE_OK)) {
if (!resultBean.isOkResult()) { //唯一码验证成功
return resultBean; log.info("唯一码[" + barcode.getBarcode() + "]验证成功");
} else {
log.info("唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage());
throw new ValidateException("smfcore.riCheckApi.error", "唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage() + ""
, new String[]{param.getCode().toString(), param.getMessage()});
}
} }
} }
} else { String pn = barcode.getPartNumber();
//唯一码校验接口 String reelId = barcode.getBarcode();
ResponseParam param = HikApi.riCheckApi(SecurityUtils.getCurrentUsername(), barcode.getBarcode(), "", ""); String num = barcode.getAmount() + "";
Integer qty = barcode.getAmount();
if (ObjectUtil.isNotEmpty(param)) { String msl = barcode.getMsl();
if (param.getCode().equals(HikApi.CODE_OK)) { try {
//唯一码验证成功 //创建入库任务，暂不指定库位
log.info("唯一码[" + barcode.getBarcode() + "]验证成功"); DataLog dataLog = new DataLog();
dataLog.setBarcode(reelId);
} else { dataLog.setPartNumber(pn);
log.info("唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage()); dataLog.setType(OP.PUT_IN);
throw new ValidateException("smfcore.riCheckApi.error", "唯一码[" + barcode.getBarcode() + "]验证失败：" + param.getCode() + "=" + param.getMessage() + "" dataLog.setInType(inType);
, new String[]{param.getCode().toString(), param.getMessage()}); dataLog.setProvider(barcode.getProvider());
dataLog.setBatchInfo(barcode.getBatch());
if(inType.equals(5)){
InList inList=inListCache.getInList(docName);
dataLog.setSourceName(docName);
dataLog.setSubSourceInfo(inList.getDocNo());
} }
}
}
String pn = barcode.getPartNumber(); barcode.setPutInTime(System.currentTimeMillis());
String reelId = barcode.getBarcode(); barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber()));
String num = barcode.getAmount() + ""; barcodeManager.saveBarcode(barcode);
Integer qty = barcode.getAmount();
String msl = barcode.getMsl();
try {
//创建入库任务，暂不指定库位
DataLog dataLog = new DataLog();
dataLog.setBarcode(reelId);
dataLog.setPartNumber(pn);
dataLog.setType(OP.PUT_IN);
dataLog.setInType(inType);
dataLog.setProvider(barcode.getProvider());
dataLog.setBatchInfo(barcode.getBatch());
if(inType.equals(5)){
InList inList=inListCache.getInList(docName);
dataLog.setSourceName(docName);
dataLog.setSubSourceInfo(inList.getDocNo());
}
barcode.setPutInTime(System.currentTimeMillis()); dataLog.setNum(barcode.getAmount());
barcode.updateSluggishTime(dataCache.getPNsluggishDay(barcode.getPartNumber())); dataLog.setStatus(OP_STATUS.WAIT.name());
barcodeManager.saveBarcode(barcode); dataLog.setGroupId(storage.getGroupId());
dataLog.setStorageId(storageId);
dataLog.setNum(barcode.getAmount()); dataLog.setMemo(barcode.getMemo());
dataLog.setStatus(OP_STATUS.WAIT.name()); dataLog.setOperator(loginUser);
dataLog.setGroupId(storage.getGroupId()); if (ObjectUtil.isNotEmpty(storageId)) {
dataLog.setStorageId(storageId); if (storage != null) {
dataLog.setMemo(barcode.getMemo()); dataLog.setCid(storage.getCid());
dataLog.setOperator(loginUser); dataLog.setStorageName(storage.getName());
if (ObjectUtil.isNotEmpty(storageId)) { }
if (storage != null) { }
dataLog.setCid(storage.getCid()); log.info("用户[" + loginUser + "]创建料架[" + storage.getName() + "]的入库任务：barcode[" + barcode.getBarcode() + "],cid[" + storage.getCid() + "],inType[" + inType + "]");
dataLog.setStorageName(storage.getName()); try {
taskService.addTaskToExecute(dataLog);
} catch (Exception e) {
return ResultBean.newErrorResult(-1,"smfclient.nlp.error","入库失败:"+e.getMessage(),new String[]{e.getMessage()});
} }
}
log.info("用户[" + loginUser + "]创建料架[" + storage.getName() + "]的入库任务：barcode[" + barcode.getBarcode() + "],cid[" + storage.getCid() + "],inType[" + inType + "]");
try {
taskService.addTaskToExecute(dataLog);
} catch (Exception e) {
return ResultBean.newErrorResult(-1,"smfclient.nlp.error","入库失败:"+e.getMessage(),new String[]{e.getMessage()});
}
} catch (ValidateException e) { } catch (ValidateException e) {
log.error(e.toString()); log.error(e.toString());
return ResultBean.newErrorResult(1, e.getMsgKey(), e.getDefaultMsg()); return ResultBean.newErrorResult(1, e.getMsgKey(), e.getDefaultMsg());
}
return ResultBean.newOkResult("");
} }
return ResultBean.newOkResult("");
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -215,6 +215,7 @@ public class StoragePosController { ...@@ -215,6 +215,7 @@ public class StoragePosController {
} }
pos.setEnabled(enabledDto.isEnabled()); pos.setEnabled(enabledDto.isEnabled());
storagePosManager.save(pos); storagePosManager.save(pos);
dataCache.updateDisablePos(pos);
log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled()); log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled());
DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername()); DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
...@@ -244,6 +245,7 @@ public class StoragePosController { ...@@ -244,6 +245,7 @@ public class StoragePosController {
String enabledStr=""; String enabledStr="";
if(pos.isEnabled()!= saveDto.isEnabled()){ if(pos.isEnabled()!= saveDto.isEnabled()){
pos.setEnabled(saveDto.isEnabled()); pos.setEnabled(saveDto.isEnabled());
dataCache.updateDisablePos(pos);
enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位"; enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位";
DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername()); DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
} }
......
src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java
...@@ -43,6 +43,8 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> { ...@@ -43,6 +43,8 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
List<StoragePos> findNotEmpty(); List<StoragePos> findNotEmpty();
List<StoragePos> findDisabled();
List<StoragePos> findByStorage(String storageId); List<StoragePos> findByStorage(String storageId);
void insertAll(List<StoragePos> posList); void insertAll(List<StoragePos> posList);
......
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java
...@@ -7,10 +7,8 @@ import com.google.common.collect.Maps; ...@@ -7,10 +7,8 @@ import com.google.common.collect.Maps;
import com.neotel.smfcore.common.base.IExcelDownLoad; import com.neotel.smfcore.common.base.IExcelDownLoad;
import com.neotel.smfcore.common.bean.PageData; import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.common.utils.FileUtil; import com.neotel.smfcore.common.utils.FileUtil;
import com.neotel.smfcore.common.utils.PointUtil; import com.neotel.smfcore.common.utils.PointUtil;
import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.bean.PlateSizeBean; import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.language.util.MessageUtils; import com.neotel.smfcore.core.language.util.MessageUtils;
...@@ -21,7 +19,6 @@ import com.neotel.smfcore.core.storage.service.dao.IStoragePosDao; ...@@ -21,7 +19,6 @@ import com.neotel.smfcore.core.storage.service.dao.IStoragePosDao;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager; 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.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.security.service.po.User;
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.data.domain.Pageable; import org.springframework.data.domain.Pageable;
...@@ -415,6 +412,13 @@ public class StoragePosManagerImpl implements IStoragePosManager { ...@@ -415,6 +412,13 @@ public class StoragePosManagerImpl implements IStoragePosManager {
} }
@Override @Override
public List<StoragePos> findDisabled(){
Criteria c = Criteria.where("enabled").is(false);//不可用;
Query query = new Query(c);
return storagePosDao.findByQuery(query);
}
@Override
public List<StoragePos> findByStorage(String storageId) { public List<StoragePos> findByStorage(String storageId) {
return storagePosDao.findListByCondition(new String[]{"storageId" }, new String[]{storageId }); return storagePosDao.findListByCondition(new String[]{"storageId" }, new String[]{storageId });
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!