Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 94964b9c 由 LN
选项

韩华接口代码

1 个父辈 ad15d4bb
内嵌 并排
正在显示 1 个修改的文件 包含 60 行增加 和 13 行删除
src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSCommunicator.java
......@@ -486,9 +486,13 @@ public class TMSCommunicator implements WsMsgReceivedListener {
*/
private void RequestDeliveryOrder(int requestID, List<String> partItem, List<Integer> partCount, boolean towerLamp) {
// 3.9 ResponseDeliveryOrder
try{
try {
if(partItem.size()>0&&partCount.size()>0) {
if (partItem == null || partCount == null || partItem.size() <= 0 || partCount.size() <= 0) {
log.info("RequestDeliveryOrder 数据不完整，直接返回");
ResponseDeliveryOrder(requestID, new ArrayList<>(), "");
return;
}
String soName = "DeliveryOrder-" + DateUtil.toDateString(new Date(), "yyyyMMddHHmmss");
List<LiteOrderItem> liteOrderItems = new ArrayList<>();
int index = 0;
......@@ -505,7 +509,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
LiteOrder liteOrder = createOrder(requestID, liteOrderItems, soName, true);
liteOrder = liteOrderCache.getLiteOrder(liteOrder.getOrderNo());
if(liteOrder!=null) {
if (liteOrder != null) {
List<DataLog> dataLogs = taskService.getAllTasks();
List<TMSPart> parts = new ArrayList<>();
for (LiteOrderItem item :
......@@ -522,6 +526,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
requestNum = task.getNum() - (curroNum - item.getNeedNum());
}
TMSPart p = TMSPart.newBean(task.getPartNumber(), task.getBarcode(), requestNum, task.getNum(), TMS_Code.CODE_1010, task.getCid(), task.getPosName());
log.info("RequestDeliveryOrder pn="+task.getPartNumber()+",出库结果：code="+TMS_Code.CODE_1010+",posName="+task.getPosName()+",barcode="+task.getBarcode());
parts.add(p);
}
}
......@@ -529,18 +534,19 @@ public class TMSCommunicator implements WsMsgReceivedListener {
if (curroNum <= 0) {
//未出库
TMSPart p = TMSPart.newBean(item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2019, "", "");
log.info("RequestDeliveryOrder pn="+item.getPn()+",出库失败：code="+TMS_Code.CODE_2019);
parts.add(p);
}
}
ResponseDeliveryOrder(requestID, parts, liteOrder.getOrderNo());
}
}
}catch (Exception exception){
log.error("RequestDeliveryOrder error:"+exception.toString());
} catch (Exception exception) {
log.error("RequestDeliveryOrder error:" + exception.toString());
}
ResponseDeliveryOrder(requestID,new ArrayList<>(),"");
ResponseDeliveryOrder(requestID, new ArrayList<>(), "");
}
/**
......@@ -560,6 +566,9 @@ public class TMSCommunicator implements WsMsgReceivedListener {
List<LiteOrderItem> liteOrderItems = new ArrayList<>();
for (TMSPos tmsPos : Locations) {
if(ObjectUtil.isEmpty(tmsPos.getColID())&&ObjectUtil.isEmpty(tmsPos.getRowID())){
continue;
}
String cid = tmsPos.getRackID();
Storage storage = dataCache.getStorage(cid);
......@@ -570,12 +579,15 @@ public class TMSCommunicator implements WsMsgReceivedListener {
}
StoragePos pos = storagePosManager.getByPosName(posName);
if (pos == null) {
log.info("RequestDeliveryOrderByLocation : cid="+cid+", pos="+posName+",未找到库位号，出库结果：code="+TMS_Code.CODE_2019 );
posResultMap.put(posName, TMS_Code.CODE_2019);
} else if (pos.getBarcode() == null) {
log.info("RequestDeliveryOrderByLocation : cid="+cid+", pos="+posName+",库位为空，出库失败，结果：code="+TMS_Code.CODE_2019 );
posResultMap.put(posName, TMS_Code.CODE_2041);
} else {
posResultMap.put(posName, TMS_Code.CODE_1011); //默认是开始送货时失败
log.info("RequestDeliveryOrderByLocation : cid="+cid+", pos="+posName+",可出库，准备创建工单" );
LiteOrderItem item = new LiteOrderItem();
item.setRi(pos.getBarcode().getBarcode());
item.setNeedNum(1);
......@@ -594,6 +606,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
dataLogs) {
if (task.isCheckOutTask() && task.getSourceName().equals(liteOrder.getOrderNo()) && task.getBarcode().equals(item.getRi())) {
posResultMap.put(task.getPosName(), TMS_Code.CODE_1010);//状态改为开始送货
log.info("RequestDeliveryOrderByLocation : cid="+task.getCid()+", pos="+task.getPosName()+",出库成功，code="+ TMS_Code.CODE_1010);
break;
}
}
......@@ -640,6 +653,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
StoragePos pos = storagePosManager.getByBarcode(ri);
if (pos == null) {
posResultMap.put(ri, TMS_Code.CODE_2041);
log.info("RequestDeliveryOrderByLocation : ri="+ri+", 未找到物料，出库失败，code="+ TMS_Code.CODE_2041);
} else {
posResultMap.put(ri, TMS_Code.CODE_1011); //默认是开始送货时失败
......@@ -647,6 +661,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
item.setRi(pos.getBarcode().getBarcode());
item.setNeedNum(1);
liteOrderItems.add(item);
log.info("RequestDeliveryOrderByLocation : ri="+ri+", 可出库，准备创建工单");
}
}
......@@ -661,6 +676,7 @@ public class TMSCommunicator implements WsMsgReceivedListener {
dataLogs) {
if (task.isCheckOutTask() && task.getSourceName().equals(liteOrder.getOrderNo()) && task.getBarcode().equals(item.getRi())) {
posResultMap.put(task.getBarcode(), TMS_Code.CODE_1010);//状态改为开始送货
log.info("RequestDeliveryOrderByLocation : ri="+task.getBarcode()+", 出库成功，code="+TMS_Code.CODE_1010);
break;
}
}
......@@ -689,21 +705,52 @@ public class TMSCommunicator implements WsMsgReceivedListener {
/**
* 3.14 RequestUpdateDeliveryReserveState
* @param requestID
* @param ReserveCodes
* @param ResultCodes
* @param reserveCodes
* @param resultCodes
*/
private void RequestUpdateDeliveryReserveState(int requestID, List<String> ReserveCodes, List<Integer> ResultCodes) {
private void RequestUpdateDeliveryReserveState(int requestID, List<String> reserveCodes, List<Integer> resultCodes) {
//3.15 ResponseUpdateDeliveryReserveState
List<TMSReserve> ReserveList = new ArrayList<>();
int state = 0;
try {
log.info("RequestUpdateDeliveryReserveState : reserveCodes="+JsonUtil.toJsonStr(reserveCodes)+",resultCodes="+JsonUtil.toJsonStr(resultCodes)+" 返回结果");
if(reserveCodes!=null&&resultCodes!=null&&reserveCodes.size()==resultCodes.size()) {
for (int i=0;i<reserveCodes.size();i++){
String reserveCode=reserveCodes.get(i);
Integer code=resultCodes.get(i);
TMSReserve tmsReserve=new TMSReserve();
tmsReserve.setReserveCode(reserveCode);
tmsReserve.setPartList(new ArrayList<>());
tmsReserve.setResultCode(code+"");
ReserveList.add(tmsReserve);
}
}
} catch (Exception exception) {
log.error("RequestUpdateDeliveryReserveState error:" + exception.toString());
}
ResponseUpdateDeliveryReserveState(requestID, ReserveList,state);
}
/**
* 3.19 RequestReStoreIn
* @param requestID
* @param ReelCode
* @param Count
* @param reelCode
* @param count
*/
private void RequestReStoreIn(int requestID, String ReelCode, int Count) {
private void RequestReStoreIn(int requestID, String reelCode, int count) {
//3.20 ResponseReStoreIn
int code = Integer.valueOf(TMS_Code.CODE_0001);
try {
log.info("RequestReStoreIn reelcode=" + reelCode + ",reelCode=" + reelCode + ",count=" + count + ", 返回失败，code=" + code);
} catch (Exception exception) {
log.error("RequestReStoreIn reelcode=" + reelCode + ",reelCode=" + reelCode + ",count=" + count + ", error:" + exception.toString());
}
ResponseReStoreIn(requestID, reelCode, count, code);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!