Skip to content

孙克 / smf-core

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

PanaCIM对接修改

1 个父辈 9203ff15
内嵌 并排
正在显示 1 个修改的文件 包含 18 行增加 和 16 行删除
src/main/java/com/neotel/smfcore/custom/panacim/PanaApiController.java
...@@ -48,6 +48,8 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -48,6 +48,8 @@ public class PanaApiController extends BaseSmfApiListener {
protected static DataCache dataCache; protected static DataCache dataCache;
private static String PanaTowerID = "SMDBOX";
@Autowired @Autowired
protected CodeResolve codeResolve; protected CodeResolve codeResolve;
...@@ -154,7 +156,7 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -154,7 +156,7 @@ public class PanaApiController extends BaseSmfApiListener {
result.put("TransactionID",TransactionID); result.put("TransactionID",TransactionID);
result.put("ErrorCode","0"); result.put("ErrorCode","0");
result.put("JobID",JobID); result.put("JobID",JobID);
result.put("TowerID",TowerID); result.put("TowerID",PanaTowerID);
result.put("ReelBarcodesDelivered",ReelBarcodesDelivered); result.put("ReelBarcodesDelivered",ReelBarcodesDelivered);
result.put("ReelBarcodesNonExisting", ReelBarcodesNonExisting); result.put("ReelBarcodesNonExisting", ReelBarcodesNonExisting);
...@@ -187,24 +189,24 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -187,24 +189,24 @@ public class PanaApiController extends BaseSmfApiListener {
} }
*/ */
Collection<Storage> allStorage = dataCache.getAllStorage().values(); Collection<Storage> allStorage = dataCache.getAllStorage().values();
List<Storage> storageList = Lists.newArrayList(); Collection<Storage> storageList = allStorage;
if(Strings.isNullOrEmpty(TowerID)){ // if(Strings.isNullOrEmpty(TowerID)){
storageList.addAll(allStorage); // storageList.addAll(allStorage);
}else{ // }else{
for (Storage storage : allStorage) { // for (Storage storage : allStorage) {
if(storage.getName().equals(TowerID)){ // if(storage.getName().equals(TowerID)){
storageList.add(storage); // storageList.add(storage);
break; // break;
} // }
} // }
} // }
List ReelBarCodes = Lists.newArrayList(); List ReelBarCodes = Lists.newArrayList();
for (Storage storage : storageList) { for (Storage storage : storageList) {
List<StoragePos> poses = storagePosManager.findNotEmptyByStorageId(storage.getId()); List<StoragePos> poses = storagePosManager.findNotEmptyByStorageId(storage.getId());
for (StoragePos pos : poses){ for (StoragePos pos : poses){
Barcode barcode = pos.getBarcode(); Barcode barcode = pos.getBarcode();
Map<String,Object> item = Maps.newHashMap(); Map<String,Object> item = Maps.newHashMap();
item.put("TowerID",TowerID); item.put("TowerID",PanaTowerID);
item.put("JobID",barcode.getLockName()); item.put("JobID",barcode.getLockName());
item.put("ReelBarcode",barcode.getBarcode()); item.put("ReelBarcode",barcode.getBarcode());
item.put("PartNo",barcode.getPartNumber()); item.put("PartNo",barcode.getPartNumber());
...@@ -363,7 +365,7 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -363,7 +365,7 @@ public class PanaApiController extends BaseSmfApiListener {
result.put("TransactionID",TransactionID); result.put("TransactionID",TransactionID);
result.put("ErrorCode","0"); result.put("ErrorCode","0");
result.put("JobID",JobID); result.put("JobID",JobID);
result.put("TowerID",TowerID); result.put("TowerID",PanaTowerID);
result.put("ReelBarcodesFailed",ReelBarcodesFailed); result.put("ReelBarcodesFailed",ReelBarcodesFailed);
} }
...@@ -571,7 +573,7 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -571,7 +573,7 @@ public class PanaApiController extends BaseSmfApiListener {
params.put("Msd",false); params.put("Msd",false);
params.put("MsdLevel","1"); params.put("MsdLevel","1");
params.put("Location","0"); params.put("Location","0");
params.put("TowerID",task.getStorageName()); params.put("TowerID",PanaTowerID);
log.info("向 PanaCIM["+inNotifyApi+"] 通知料盘【"+task.getBarcode()+"】的入库信息:" + params); log.info("向 PanaCIM["+inNotifyApi+"] 通知料盘【"+task.getBarcode()+"】的入库信息:" + params);
String result = HttpHelper.postJson(inNotifyApi,params); String result = HttpHelper.postJson(inNotifyApi,params);
log.info("Response Of checkInNotification From PanaCIM:"+result); log.info("Response Of checkInNotification From PanaCIM:"+result);
...@@ -599,7 +601,7 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -599,7 +601,7 @@ public class PanaApiController extends BaseSmfApiListener {
params.put("Quantity",task.getNum()); params.put("Quantity",task.getNum());
SimpleDateFormat dataformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dataformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
params.put("Timestamp",dataformat.format(new Date())); params.put("Timestamp",dataformat.format(new Date()));
params.put("TowerID",task.getStorageName()); params.put("TowerID",PanaTowerID);
params.put("JobID",task.getSourceId()); params.put("JobID",task.getSourceId());
params.put("Msd",false); params.put("Msd",false);
params.put("MsdLevel","1"); params.put("MsdLevel","1");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!