소스 검색

Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

xiahan 10 달 전
부모
커밋
0778f70d68
1개의 변경된 파일3개의 추가작업 그리고 0개의 파일을 삭제
  1. 3 0
      cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductDetailServiceImpl.java

+ 3 - 0
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductDetailServiceImpl.java

@@ -82,6 +82,9 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
             List<ApsProcessMaterialDo> metalDos = apsProductDetailDao.getMetalData();
             List<ApsProcessMaterialDo> metalStateDos = apsProductDetailDao.getMetalStateData();
             List<VNcOrderDetailVo> vNcOrderDetailVoList = slaveSourceService.getVNcOrderDetailVo(orderNos);
+            if (vNcOrderDetailVoList.size() == 0) {
+                return R.error("客户订单系统没有找到该订单的产品明细");
+            }
             for (VNcOrderDetailVo detailVo : vNcOrderDetailVoList) {
                 //物料
                 ApsProcessMaterialDo apsProcessMaterialDo = materialDos.stream().filter(apm -> apm.getMaterialname().equals(detailVo.getMaterialname())).findAny().orElse(null);