diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index 9021928ce..9842cb176 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -132,6 +132,19 @@ public class IoFifoDesOrderController extends BaseController { return ResultVOUtils.success("损耗出库成功"); } + @PostMapping("/udiwms/collect/fifo/desOrder/destroyOutByCode") + public BaseResponse destroyOutByCode(@RequestBody AddInvDesDetaiRequest addInvDesDetaiRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + Boolean save = splitDesOrderService.destroyOutByCode(addInvDesDetaiRequest); + if (!save){ + return ResultVOUtils.error("错误"); + } + return ResultVOUtils.success("损耗出库成功"); + } + /** * 拆零表损耗出库 * @@ -149,5 +162,4 @@ public class IoFifoDesOrderController extends BaseController { return ResultVOUtils.success("损耗出库成功"); } - } diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index a859fb60c..d936a1b54 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -161,7 +161,7 @@ public class IoSplitDesOrderService extends ServiceImpl() + .eq(IoSplitFifoInv::getId,splitFifoCodeEntity.getInvIdFk())); + if (splitFifoInv == null){ + throw new JsonException(5000,"未找到该产品!"); + } + //修改产品 库存 入库数量 + splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount()); + splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量 + splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量 + splitFifoInv.setAvailableCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount()-splitFifoInv.getLockCount());//实用数量 + splitFifoInv.setUpdateTime(new Date()); + //更改 库存 + boolean update = ioSplitFifoInvService.updateById(splitFifoInv); + if (!update){ + return false; + } + IoSplitDesOrderDetail splitDesOrderDetail = IoSplitDesOrderDetail.builder() + .id(IdUtil.getSnowflakeNextId()) + .workPlaceCode(collectOrder.getWorkPlaceCode()) + .orderIdFk(collectOrder.getBillNo()) + .invId(splitFifoInv.getId()) + .relId(splitFifoInv.getRelId()) + .batchNo(splitFifoInv.getBatchNo()) + .produceDate(splitFifoInv.getProduceDate()) + .expireDate(splitFifoInv.getExpireDate()) + .supId(splitFifoInv.getSupId()) + .count(addInvDesDetaiRequest.getOutCount()) + .reCount(addInvDesDetaiRequest.getOutCount()) .createTime(new Date()) .updateTime(new Date()) .remark("").build();