diff --git a/.gitignore b/.gitignore index 526babe5..b067ec8b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,9 @@ target # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* /build/ -.gradle/ \ No newline at end of file +.gradle/ + +# 本地行尾与编辑器配置仅用于开发机,不参与版本提交 - rqrq +.gitattributes +.editorconfig +.vscode/ \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPhysicalInventoryServiceImpl.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPhysicalInventoryServiceImpl.java index c40cdd4c..4201a06c 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPhysicalInventoryServiceImpl.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPhysicalInventoryServiceImpl.java @@ -817,8 +817,9 @@ public class HaiAnPhysicalInventoryServiceImpl implements HaiAnPhysicalInventory pdaRequest.setPalletId(requestData.getPalletId().trim()); // 调用海安立库服务执行固定出库口Call托盘,关键入参为site+palletId;失败会导致PDA无法拉板到盘点位 - rqrq HaiAnWcsActionResult actionResult = haiAnPdaAutoWarehouseService.callOutToOutboundPort(pdaRequest); - if (actionResult == null || !Boolean.TRUE.equals(actionResult.getSuccess())) { - throw new RuntimeException(actionResult == null ? "海安Call栈板失败" : actionResult.getMessage()); + // 海安Call托盘接口失败场景通过抛异常返回,动作结果仅承载mockMode与message;因此仅校验返回体非空 - rqrq + if (actionResult == null) { + throw new RuntimeException("海安Call栈板失败"); } }