diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java b/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java index 0b80bf6..c9743bd 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/service/PurchaseServiceImpl.java @@ -231,9 +231,7 @@ public class PurchaseServiceImpl implements PurchaseService { outPlanVo.setAddress("无"); // return ServerResponse.createErroe("请填写收获地址"); } - if (files == null || files.length < 1) { - return ServerResponse.createErroe("请上传附件"); - } + List detailsList = outPlanVo.getDetailsList(); if (StringUtils.isEmpty(detailsList)) { return ServerResponse.createErroe("发货明细不能为空"); @@ -312,9 +310,11 @@ public class PurchaseServiceImpl implements PurchaseService { return ServerResponse.createErroe("新增数据异常,请稍后重试"); } - List fileList = uploadService.uploadImage(files, outPlanVo.getId(), "st_plan_out", "采购发货附件"); - if (fileList.size() != files.length) { - return ServerResponse.createErroe("文件上传失败!"); + if (files != null && files.length > 0) { + List fileList = uploadService.uploadImage(files, outPlanVo.getId(), "st_plan_out", "采购发货附件"); + if (fileList.size() != files.length) { + return ServerResponse.createErroe("文件上传失败!"); + } } for (OutPlanVoDetails details : detailsList) { @@ -376,10 +376,6 @@ public class PurchaseServiceImpl implements PurchaseService { outPlanVo.setUpdater(userId); outPlanVo.setCreator(userId); -/* - {"projectId":"466","needTime":"2025-07-16","projectPart":"1","applyType":"safety-tool","remark":"1","jsonData":"[{\"modelId\":\"4\",\"type\":\"安全工器具\",\"name\":\"大挂钩\",\"model\":\"60mm\",\"unit\":\"付\",\"needNum\":\"10\",\"backDate\":\"\",\"remark\":\"\"}]"} -*/ - /* List details = JSON.parseArray(data.getJsonData(), PlanDetailVo.class);*/ PlanApplyVo planApplyVo = new PlanApplyVo(); planApplyVo.setCreator(userName); @@ -403,9 +399,7 @@ public class PurchaseServiceImpl implements PurchaseService { outPlanVo.setAddress("无"); // return ServerResponse.createErroe("请填写收获地址"); } - if (files == null || files.length < 1) { - return ServerResponse.createErroe("请上传附件"); - } + List detailsList = outPlanVo.getDetailsList(); if (StringUtils.isEmpty(detailsList)) { @@ -477,11 +471,14 @@ public class PurchaseServiceImpl implements PurchaseService { return ServerResponse.createErroe("新增数据异常,请稍后重试"); } - List fileList = uploadService.uploadImage(files, outPlanVo.getId(), "st_plan_out", "采购发货附件"); - if (fileList.size() != files.length) { - return ServerResponse.createErroe("文件上传失败!"); + if (files != null && files.length > 0) { + List fileList = uploadService.uploadImage(files, outPlanVo.getId(), "st_plan_out", "采购发货附件"); + if (fileList.size() != files.length) { + return ServerResponse.createErroe("文件上传失败!"); + } } + for (OutPlanVoDetails details : detailsList) { details.setOutId(outPlanVo.getId()); details.setDetailId(String.valueOf(planApplyVo.getId())); @@ -639,7 +636,7 @@ public class PurchaseServiceImpl implements PurchaseService { maTypeVo.setModelId(details.getModelId()); int num = maTypeMapper.maTypeCheck(maTypeVo); //数据校验 - if (hisNum < lkNum) { + if (hisNum < ckNum) { if (lkNum - hisNum > num) { return ServerResponse.createErroe(details.getModel() + "-型号设备的利库量大于库存量,库存不足!"); }