🆕 盘点类型枚举修改
All checks were successful
Release / Release (push) Successful in 44s

This commit is contained in:
my_ong 2025-03-05 23:46:05 +08:00
parent a96a9e571e
commit 3ccc377c3a
4 changed files with 14 additions and 11 deletions

View File

@ -173,19 +173,19 @@ public class ApplyFormController {
applyForm.setType(ApplyTypeEnum.AUDIT);
applyFormService.save(applyForm);
List<Material> materials;
if(applyInfo.getAuditType() == AuditTypeEnum.ALL){
materials = materialService.list();
}else{
if(applyInfo.getAuditType() == AuditTypeEnum.SCAN){
materials = materialService.listByIds(applyInfo.getIds());
materials.forEach(material -> applyDetailService.save(ApplyDetail.builder()
.applyId(applyForm.getId())
.materialId(material.getId())
.quantity(material.getStock())
.build()));
}
materials.forEach(material -> applyDetailService.save(ApplyDetail.builder()
.applyId(applyForm.getId())
.materialId(material.getId())
.quantity(material.getStock())
.build()));
}
@GetMapping("wait-scan-data/{applyId}")
@Operation(summary = "获取盘点的待扫码信息")
public List<WaitScanInfo> getWaitScanData(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) {

View File

@ -23,6 +23,9 @@ public class AuditApplyInfo extends ApplyForm {
@Schema(description = "物料ids")
private List<String> ids;
@Schema(description = "物料类型")
private List<String> types;
public ApplyForm to(){
return Json.fromJson(ApplyForm.class, Json.toJson(this));

View File

@ -47,7 +47,7 @@ public class ApplyForm extends IdBaseEntity {
@ColDefine(type = ColType.INT)
private ApplyTypeEnum type;
@Schema(description = "盘点类型1: 全盘 2: 部分盘点", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Schema(description = "盘点类型1: 扫码 2: 人工", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@TableField("af_audit_type")
@Column("af_audit_type")
@Comment("盘点类型")

View File

@ -13,8 +13,8 @@ import lombok.Getter;
@AllArgsConstructor
public enum AuditTypeEnum implements ICodeBook {
ALL("1", "全部盘点"),
PARTIAL("2", "部分盘点")
SCAN("1", "扫码盘点"),
PARTIAL("2", "人工盘点"),
;
@EnumValue