出库部分
This commit is contained in:
@@ -467,5 +467,11 @@ public class PdaController extends BaseController {
|
|||||||
List<SysDictData> list = dictTypeService.selectDictDataByType(dictType);
|
List<SysDictData> list = dictTypeService.selectDictDataByType(dictType);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping("/movePoint")
|
||||||
|
@ResponseBody
|
||||||
|
public AjaxResult movePoint(String startPoint, String endPoint) {
|
||||||
|
return pdaService.movePoint(startPoint,endPoint);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,4 +44,6 @@ public interface PdaService {
|
|||||||
AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure);
|
AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure);
|
||||||
|
|
||||||
AjaxResult bindShelf(TrayCodeMakeSure trayCodeMakeSure);
|
AjaxResult bindShelf(TrayCodeMakeSure trayCodeMakeSure);
|
||||||
|
|
||||||
|
AjaxResult movePoint(String startPoint, String endPoint);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -793,4 +793,28 @@ public class PdaServiceImp implements PdaService {
|
|||||||
|
|
||||||
return AjaxResult.success();
|
return AjaxResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AjaxResult movePoint(String startPoint, String endPoint) {
|
||||||
|
BasContainerDetails basContainerDetails = new BasContainerDetails();
|
||||||
|
basContainerDetails.setContainerId(startPoint);
|
||||||
|
List<BasContainerDetails> basContainerDetails1 = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails);
|
||||||
|
if(basContainerDetails1.size()==0){
|
||||||
|
return AjaxResult.error("此起点无料架,请检查");
|
||||||
|
}
|
||||||
|
BasContainerDetails basContainer=basContainerDetails1.get(0);
|
||||||
|
|
||||||
|
String result = HttpUtil.post("http://192.168.1.100:8080/agv/api/receiveAgvMoveJob", "startPoint=" + startPoint + "&endPoint=" + endPoint + "&containerCode=" + basContainer.getContainerId());
|
||||||
|
//接口的返回结果为AjaxResult,从result中获取code
|
||||||
|
|
||||||
|
//获取code
|
||||||
|
int code = JSONObject.parseObject(result).getIntValue("code");
|
||||||
|
if(code==200){
|
||||||
|
return AjaxResult.success(result);
|
||||||
|
}else{
|
||||||
|
return AjaxResult.warn(JSONObject.parseObject(result).getString("msg"));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user