From 903e4a47efdd83410387c938b2c9fcc0772e79c8 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Mon, 5 Aug 2024 15:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BC=98=E5=8C=96#1?= =?UTF-8?q?=E3=80=81=E5=87=BA=E5=85=A5=E5=BA=93=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SparePartInWarehouseServiceImpl.java | 2 +- .../impl/SparePartOutWarehouseServiceImpl.java | 4 ++-- .../impl/SparePartStockAuditServiceImpl.java | 4 ++-- .../SparePartStockAuditParam.java | 2 +- .../SparePartOutWarehouseListVo.java | 2 +- .../sparePartAllotListVo/SparePartAllotListVo.java | 2 +- .../SparePartInWarehouseListVo.java | 2 +- .../SparePartStockAuditDetailVo.java | 2 +- .../SparePartStockAuditListVo.java | 4 ++-- .../sparePartStockAudit/SparePartStockAudit.java | 2 +- .../com/hcy/common/enums/Audit/AuditStateEnum.java | 13 ++++++------- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java index 655c018..e556de9 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java @@ -64,7 +64,7 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer Integer limit = pageParam.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("out_in_warehouse_type",0); + queryWrapper.eq("receipt_type",0); queryWrapper.eq("is_delete", 0); queryWrapper.orderByDesc("id"); diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java index b8a6528..0c1a5f4 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java @@ -60,7 +60,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS Integer limit = pageParam.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("out_in_warehouse_type",1); + queryWrapper.eq("receipt_type",1); queryWrapper.eq("is_delete", 0); queryWrapper.orderByDesc("id"); @@ -168,7 +168,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS } model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库 - model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别（1=调拨出库） + model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别 2=员工领料，3=销售出库） model.setConsignee(sparePartStockAuditParam.getConsignee()); // 收货单位（人员） model.setPhone(sparePartStockAuditParam.getPhone()); // 联系电话 model.setReceiptNumber(generateOrderNumber()); // 单据编号 diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java index 0b5fbe1..e8ae999 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java @@ -284,7 +284,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi Assert.notNull(model, "数据不存在!"); model.setId(sparePartStockAuditParam.getId()); - model.setAuditResult(sparePartStockAuditParam.getAuditResult()); // 审核结果（0=未通过，1=已通过） + model.setAuditResult(sparePartStockAuditParam.getAuditResult()); // 审核结果（0=已通过，1=未通过） model.setAuditState(AuditStateEnum.AUDITED.getStatus()); // 审核状态（0=未审核，1=已审核，2=已取消） model.setAuditTime(System.currentTimeMillis() / 1000); // 审核时间 model.setAuditIdea(sparePartStockAuditParam.getAuditIdea()); // 审核意见 @@ -336,7 +336,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi //调出仓库 SparePart sparePart = sparePartMapper.selectOne( new QueryWrapper() - .eq("id", sparePartAudit.getSparePartsId()) + .eq("spare_parts_code", sparePartAudit.getSparePartsCode()) .eq("warehouse_id", model.getExportWarehouse()) .eq("is_delete", 0) .last("limit 1")); diff --git a/admin/src/main/java/com/hcy/admin/validate/sparePartStockAudit/SparePartStockAuditParam.java b/admin/src/main/java/com/hcy/admin/validate/sparePartStockAudit/SparePartStockAuditParam.java index 7afa589..22422c3 100644 --- a/admin/src/main/java/com/hcy/admin/validate/sparePartStockAudit/SparePartStockAuditParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/sparePartStockAudit/SparePartStockAuditParam.java @@ -83,6 +83,6 @@ public class SparePartStockAuditParam implements Serializable { private String sparePartAuditId; // 备件审核id private List sparePartAuditList; //待入库的备件 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; //出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } diff --git a/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java b/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java index 988f450..015d7be 100644 --- a/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java @@ -31,6 +31,6 @@ public class SparePartOutWarehouseListVo implements Serializable { private String consigneePhone; // 收货单位（人员）/电话 private List sparePartAuditList; //待入库的备件 private String warehouseName; // 所属仓库名 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java index 8edfeab..38049f3 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java @@ -31,6 +31,6 @@ public class SparePartAllotListVo implements Serializable { private List sparePartAuditList; //待入库的备件 private String importWarehouseName; // 调入仓库名 private String exportWarehouseName; // 调出仓库名 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java index b67deb4..08550ff 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java @@ -31,6 +31,6 @@ public class SparePartInWarehouseListVo implements Serializable { private String supplierPhone; // 供应商/电话 private List sparePartAuditList; //待入库的备件 private String warehouseName; // 所属仓库名 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java index eafd3d0..6566abd 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java @@ -36,7 +36,7 @@ public class SparePartStockAuditDetailVo implements Serializable { private String importWarehouseName; // 调入仓库名 private String exportWarehouseName; // 调出仓库名 private List sparePartAuditList; //待入库的备件 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） private String supplierPhone; // 供应商/电话 private String consigneePhone; // 收货单位（人员）/电话 diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java index 188edce..4b5806c 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java @@ -16,7 +16,7 @@ public class SparePartStockAuditListVo implements Serializable { private Long id; // 主键id private String receiptNumber; // 单据编号 - private Long receiptType; // 单据类型（0=入库单，1=出库单，2=仓库调拨单） + private Integer receiptType; // 单据类型（0=入库单，1=出库单，2=仓库调拨单） private Long warehouseId; // 所属仓库 private Long importWarehouse; // 调入仓库 private Long exportWarehouse; // 调出仓库 @@ -36,5 +36,5 @@ public class SparePartStockAuditListVo implements Serializable { private String warehouseName; // 所属仓库名 private String importWarehouseName; // 调入仓库名 private String exportWarehouseName; // 调出仓库名 - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } diff --git a/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java b/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java index 7e5ac57..cc755ac 100644 --- a/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java +++ b/common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java @@ -36,5 +36,5 @@ public class SparePartStockAudit implements Serializable { private Long updateTime; // 更新时间 private Long deleteTime; // 删除时间 private String sparePartAuditId; // 备件审核id - private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） } \ No newline at end of file diff --git a/common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java b/common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java index bf17893..93d25a5 100644 --- a/common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java +++ b/common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java @@ -15,20 +15,19 @@ public enum AuditStateEnum { AUDITED(1, "已审核"), CANCELED(2,"已取消"), - NOTPASS(0,"未通过"), - ALREADYPASSED(1, "已通过"), + NOTPASS(1,"未通过"), + ALREADYPASSED(0, "已通过"), // 单据类型（0=入库单，1=出库单，2=仓库调拨单） INWAREHOUSE(0, "入库单"), OUTWAREHOUSE(1, "出库单"), ALLOT(2,"仓库调拨单"), - // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） + // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库） STOCKIN(0,"采购入库"), - STOCKOUT(1, "调拨出库"), - STOCKTRANSFER(2, "库存调拨"), - GETMATERIALS(3,"员工领料"), - SALESOUTBOUND(4, "销售出库"); + STOCKTRANSFER(1, "库存调拨"), + GETMATERIALS(2,"员工领料"), + SALESOUTBOUND(3, "销售出库"); private final int status; private final String desc;