问题修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -324,6 +324,15 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
         if (StringUtils.isNotBlank(dto.getWarehousingSid())) {
             ScmVehicleEnterlibrary scmVehicleEnterlibrary = fetchBySid(dto.getWarehousingSid());
+            //排产
+            if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) ||
+                    ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
+                //调用金蝶接口判断采购入库单的状态是否为已审核，true已审核，false未审核
+                Boolean aBoolean = finKingDeeFeign.getStinstockState(dto.getVin()).getData();
+                if (!aBoolean) {
+                    return rb.setMsg("本台车采购入库单暂未审核，不可收车");
+                }
+            }
             if ("1".equals(scmVehicleEnterlibrary.getInboundState())) {
                 scmVehicleEnterlibrary.setInboundDate(dto.getDate());
                 scmVehicleEnterlibrary.setInbound(dto.getName());
@@ -350,15 +359,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                 }
                 //车辆台账推送数据
                 String businessSid = scmVehicleEnterlibrary.getBusinessSid();
-
                 //排产
                 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey()) ||
                         ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) {
-                    //调用金蝶接口判断采购入库单的状态是否为已审核，true已审核，false未审核
-                    Boolean aBoolean = finKingDeeFeign.getStinstockState(dto.getVin()).getData();
-                    if (!aBoolean) {
-                        return rb.setMsg("本台车采购入库单暂未审核，不可收车");
-                    }
                     BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
                     baseVehicleDto.setVinNo(dto.getVin());
                     baseVehicleDto.setVehicleState(VehicleState.StockEnum.STOCK.getCode());