IOT/ims-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 字段处理
All checks were successful
Release / Release (push) Successful in 39s
Details

Browse Source
This commit is contained in:
my_ong 2025-03-02 19:58:57 +08:00
parent d1e0abf345
commit 6841981621
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java
View File

@ -96,7 +96,7 @@ public class ApplyFormController {
// 校验物料数量 // 校验物料数量
Map<Long, Integer> confirmMap = applyInfo.getApplyDetails().stream() Map<Long, Integer> confirmMap = applyInfo.getApplyDetails().stream()
.filter(item -> item.getAssignRule() != AssignRuleEnum.LOW_VALUE) .filter(ApplyDetail::getAssignRule)
.collect(Collectors.toMap(ApplyDetail::getMaterialId, ApplyDetail::getConfirmQuantity)); .collect(Collectors.toMap(ApplyDetail::getMaterialId, ApplyDetail::getConfirmQuantity));
Map<Long, Long> dataMap = applyInfo.getDetailList().stream() Map<Long, Long> dataMap = applyInfo.getDetailList().stream()
.collect(Collectors.groupingBy(MaterialStockDetail::getMaterialId, Collectors.counting())); .collect(Collectors.groupingBy(MaterialStockDetail::getMaterialId, Collectors.counting()));
@ -126,9 +126,9 @@ public class ApplyFormController {
applyInfo.getApplyDetails().forEach(detail -> applyInfo.getApplyDetails().forEach(detail ->
materialService.update(Wrappers.<Material>lambdaUpdate() materialService.update(Wrappers.<Material>lambdaUpdate()
.eq(Material::getId, detail.getMaterialId()) .eq(Material::getId, detail.getMaterialId())
.setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, .setSql(detail.getAssignRule(),
"m_stock = m_stock + " + detail.getConfirmQuantity()) "m_stock = m_stock + " + detail.getConfirmQuantity())
.setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, .setSql(!detail.getAssignRule(),
"m_stock = m_stock + " + detail.getQuantity()) "m_stock = m_stock + " + detail.getQuantity())
)); ));
} else if (applyType == ApplyTypeEnum.LOAN_OUT) { } else if (applyType == ApplyTypeEnum.LOAN_OUT) {
@ -141,9 +141,9 @@ public class ApplyFormController {
//修改物料库存数据 //修改物料库存数据
applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.<Material>lambdaUpdate() applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.<Material>lambdaUpdate()
.eq(Material::getId, detail.getMaterialId()) .eq(Material::getId, detail.getMaterialId())
.setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, .setSql(detail.getAssignRule(),
"m_stock = m_stock - " + detail.getConfirmQuantity()) "m_stock = m_stock - " + detail.getConfirmQuantity())
.setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, .setSql(!detail.getAssignRule(),
"m_stock = m_stock - " + detail.getQuantity()) "m_stock = m_stock - " + detail.getQuantity())
)); ));
} else if (applyType == ApplyTypeEnum.RETURN_RECEIPT) { } else if (applyType == ApplyTypeEnum.RETURN_RECEIPT) {
@ -156,9 +156,9 @@ public class ApplyFormController {
//修改物料库存数据 //修改物料库存数据
applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.<Material>lambdaUpdate() applyInfo.getApplyDetails().forEach(detail -> materialService.update(Wrappers.<Material>lambdaUpdate()
.eq(Material::getId, detail.getMaterialId()) .eq(Material::getId, detail.getMaterialId())
.setSql(detail.getAssignRule() == AssignRuleEnum.HIGH_VALUE, .setSql(detail.getAssignRule(),
"m_stock = m_stock + " + detail.getConfirmQuantity()) "m_stock = m_stock + " + detail.getConfirmQuantity())
.setSql(detail.getAssignRule() == AssignRuleEnum.LOW_VALUE, .setSql(!detail.getAssignRule(),
"m_stock = m_stock + " + detail.getQuantity()) "m_stock = m_stock + " + detail.getQuantity())
)); ));
} }

3
src/main/java/tech/riemann/ims/entity/material/ApplyDetail.java
View File

@ -12,7 +12,6 @@ import lombok.experimental.FieldNameConstants;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import org.nutz.dao.entity.annotation.*; import org.nutz.dao.entity.annotation.*;
import tech.riemann.ims.entity.IdBaseEntity; import tech.riemann.ims.entity.IdBaseEntity;
import tech.riemann.ims.enums.AssignRuleEnum;
import java.io.Serial; import java.io.Serial;
@ -45,7 +44,7 @@ public class ApplyDetail extends IdBaseEntity {
private Long applyId; private Long applyId;
@TableField(exist = false) @TableField(exist = false)
private AssignRuleEnum assignRule; private Boolean assignRule;
@Schema(description = "物料Id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Schema(description = "物料Id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@TableField("ad_material_id") @TableField("ad_material_id")