Commit 1abbc9a1 LN

未找到可用库位,入库NG时信息未加入inlist.

1 个父辈 ebf00dc9
...@@ -639,7 +639,7 @@ public class RobotBoxHandler extends BaseDeviceHandler { ...@@ -639,7 +639,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
// errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位"; // errorMsg = "[" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位";
errorMsg = "[" + barcode.getBarcode() + "]Not found available[" + size + "]Position"; errorMsg = "[" + barcode.getBarcode() + "]Not found available[" + size + "]Position";
resultMap.put("msg", errorMsg); resultMap.put("msg", errorMsg);
loadingUtil.updateItemState(barcode.getBarcode(), "", INITEM_STATUS.NG, errorMsg); loadingUtil.AddOrUpdateItemState(rfid,barcode ,"", INITEM_STATUS.NG, errorMsg);
log.info("获取[" + code + "]的入库库位, [" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位"); log.info("获取[" + code + "]的入库库位, [" + barcode.getBarcode() + "]未找到可用的[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]仓位");
return resultMap; return resultMap;
} }
......
...@@ -71,7 +71,7 @@ public class MicronApi { ...@@ -71,7 +71,7 @@ public class MicronApi {
// return apiName != null && apiName.equalsIgnoreCase("Micron"); // return apiName != null && apiName.equalsIgnoreCase("Micron");
Boolean apiTest =true; Boolean apiTest =true;
if(dataCache!=null){ if(dataCache!=null){
dataCache.getCache(Constants.CACHE_API_TEST); apiTest= dataCache.getCache(Constants.CACHE_API_TEST);
if (apiTest == null) { if (apiTest == null) {
apiTest = false; apiTest = false;
dataCache.updateCache(Constants.CACHE_API_TEST, apiTest); dataCache.updateCache(Constants.CACHE_API_TEST, apiTest);
......
...@@ -121,16 +121,16 @@ public class LoadingUtil { ...@@ -121,16 +121,16 @@ public class LoadingUtil {
AddInListItem(rfid,barcode,posName,state,""); AddInListItem(rfid,barcode,posName,state,"");
} }
public void AddInListItem(String rfid, Barcode barcode, String posName, String state,String ngMsg) { public InListItem AddInListItem(String rfid, Barcode barcode, String posName, String state,String ngMsg) {
InList inList = getInlist(); InList inList = getInlist();
if (inList == null) { if (inList == null) {
return; return null;
} }
//如果入库单已手动结束,不再接收新任务 //如果入库单已手动结束,不再接收新任务
if(inList.isManualFinish()){ if(inList.isManualFinish()){
log.info("AddInListItem 当前入库[" + inList.getName() + "]已手动结束,不添加新物料:"+barcode.getBarcode()); log.info("AddInListItem 当前入库[" + inList.getName() + "]已手动结束,不添加新物料:"+barcode.getBarcode());
return; return null;
} }
inList.addRfid(rfid); inList.addRfid(rfid);
inList.setStatus(INLIST_STATUS.ABNORMAL); inList.setStatus(INLIST_STATUS.ABNORMAL);
...@@ -152,6 +152,7 @@ public class LoadingUtil { ...@@ -152,6 +152,7 @@ public class LoadingUtil {
inList.setInListItems(items); inList.setInListItems(items);
inListManager.save(inList); inListManager.save(inList);
inListCache.addInListToMap(inList); inListCache.addInListToMap(inList);
return item;
} }
public InListItem GetInlistItem(String barcode) { public InListItem GetInlistItem(String barcode) {
...@@ -243,8 +244,13 @@ public class LoadingUtil { ...@@ -243,8 +244,13 @@ public class LoadingUtil {
} }
return false; return false;
} }
public InListItem AddOrUpdateItemState( String rfid, Barcode barcode,String posName,String s,String ngMsg) {
InListItem item = updateItemState(barcode.getBarcode(), posName, s, ngMsg);
if (item == null) {
item = AddInListItem(rfid, barcode, posName, s, ngMsg);
}
return item;
}
public InListItem updateItemState( String barcode,String posName,String s,String ngMsg) { public InListItem updateItemState( String barcode,String posName,String s,String ngMsg) {
if(ObjectUtil.isEmpty(ngMsg)){ if(ObjectUtil.isEmpty(ngMsg)){
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!