diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java index a7e30c0..aeabf18 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java +++ b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java @@ -96,7 +96,7 @@ public class ApplyFormController { // 校验物料数量 Map confirmMap = applyInfo.getApplyDetails().stream() - .filter(item -> item.getAssignRule() != AssignRuleEnum.LOW_VALUE) + .filter(ApplyDetail::getAssignRule) .collect(Collectors.toMap(ApplyDetail::getMaterialId, ApplyDetail::getConfirmQuantity)); Map dataMap = applyInfo.getDetailList().stream() .collect(Collectors.groupingBy(MaterialStockDetail::getMaterialId, Collectors.counting())); @@ -126,9 +126,9 @@ public class ApplyFormController { applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.lambdaUpdate() .eq(Material::getId, detail.getMaterialId()) - .setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, + .setSql(detail.getAssignRule(), "m_stock = m_stock + " + detail.getConfirmQuantity()) - .setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, + .setSql(!detail.getAssignRule(), "m_stock = m_stock + " + detail.getQuantity()) )); } else if (applyType == ApplyTypeEnum.LOAN_OUT) { @@ -141,9 +141,9 @@ public class ApplyFormController { //修改物料库存数据 applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.lambdaUpdate() .eq(Material::getId, detail.getMaterialId()) - .setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, + .setSql(detail.getAssignRule(), "m_stock = m_stock - " + detail.getConfirmQuantity()) - .setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, + .setSql(!detail.getAssignRule(), "m_stock = m_stock - " + detail.getQuantity()) )); } else if (applyType == ApplyTypeEnum.RETURN_RECEIPT) { @@ -156,9 +156,9 @@ public class ApplyFormController { //修改物料库存数据 applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.lambdaUpdate() .eq(Material::getId, detail.getMaterialId()) - .setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, + .setSql(detail.getAssignRule(), "m_stock = m_stock + " + detail.getConfirmQuantity()) - .setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, + .setSql(!detail.getAssignRule(), "m_stock = m_stock + " + detail.getQuantity()) )); } diff --git a/src/main/java/tech/riemann/ims/entity/material/ApplyDetail.java b/src/main/java/tech/riemann/ims/entity/material/ApplyDetail.java index 9f8512b..77810a6 100644 --- a/src/main/java/tech/riemann/ims/entity/material/ApplyDetail.java +++ b/src/main/java/tech/riemann/ims/entity/material/ApplyDetail.java @@ -12,7 +12,6 @@ import lombok.experimental.FieldNameConstants; import lombok.experimental.SuperBuilder; import org.nutz.dao.entity.annotation.*; import tech.riemann.ims.entity.IdBaseEntity; -import tech.riemann.ims.enums.AssignRuleEnum; import java.io.Serial; @@ -45,7 +44,7 @@ public class ApplyDetail extends IdBaseEntity { private Long applyId; @TableField(exist = false) - private AssignRuleEnum assignRule; + private Boolean assignRule; @Schema(description = "物料Id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @TableField("ad_material_id")