renfan
/
charging_pile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【admin】优化#1、出入库审核

dev
renfan 2024-08-05 15:26:23 +08:00
parent 6cfd33dc4a
commit 903e4a47ef
11 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java
View File

@ -64,7 +64,7 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
Integer limit = pageParam.getPageSize(); Integer limit = pageParam.getPageSize();
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>(); QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("out_in_warehouse_type",0); queryWrapper.eq("receipt_type",0);
queryWrapper.eq("is_delete", 0); queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");

4
admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java
View File

@ -60,7 +60,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
Integer limit = pageParam.getPageSize(); Integer limit = pageParam.getPageSize();
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>(); QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("out_in_warehouse_type",1); queryWrapper.eq("receipt_type",1);
queryWrapper.eq("is_delete", 0); queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
@ -168,7 +168,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
} }
model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库 model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库
model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别（1=调拨出库） model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别 2=员工领料，3=销售出库）
model.setConsignee(sparePartStockAuditParam.getConsignee()); // 收货单位（人员） model.setConsignee(sparePartStockAuditParam.getConsignee()); // 收货单位（人员）
model.setPhone(sparePartStockAuditParam.getPhone()); // 联系电话 model.setPhone(sparePartStockAuditParam.getPhone()); // 联系电话
model.setReceiptNumber(generateOrderNumber()); // 单据编号 model.setReceiptNumber(generateOrderNumber()); // 单据编号

4
admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java
View File

@ -284,7 +284,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
Assert.notNull(model, "数据不存在!"); Assert.notNull(model, "数据不存在!");
model.setId(sparePartStockAuditParam.getId()); 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.setAuditState(AuditStateEnum.AUDITED.getStatus()); // 审核状态（0=未审核，1=已审核，2=已取消）
model.setAuditTime(System.currentTimeMillis() / 1000); // 审核时间 model.setAuditTime(System.currentTimeMillis() / 1000); // 审核时间
model.setAuditIdea(sparePartStockAuditParam.getAuditIdea()); // 审核意见 model.setAuditIdea(sparePartStockAuditParam.getAuditIdea()); // 审核意见
@ -336,7 +336,7 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
//调出仓库 //调出仓库
SparePart sparePart = sparePartMapper.selectOne( SparePart sparePart = sparePartMapper.selectOne(
new QueryWrapper<SparePart>() new QueryWrapper<SparePart>()
.eq("id", sparePartAudit.getSparePartsId()) .eq("spare_parts_code", sparePartAudit.getSparePartsCode())
.eq("warehouse_id", model.getExportWarehouse()) .eq("warehouse_id", model.getExportWarehouse())
.eq("is_delete", 0) .eq("is_delete", 0)
.last("limit 1")); .last("limit 1"));

2
admin/src/main/java/com/hcy/admin/validate/sparePartStockAudit/SparePartStockAuditParam.java
View File

@ -83,6 +83,6 @@ public class SparePartStockAuditParam implements Serializable {
private String sparePartAuditId; // 备件审核id private String sparePartAuditId; // 备件审核id
private List<SparePartAudit> sparePartAuditList; //待入库的备件 private List<SparePartAudit> sparePartAuditList; //待入库的备件
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; //出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

2
admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java
View File

@ -31,6 +31,6 @@ public class SparePartOutWarehouseListVo implements Serializable {
private String consigneePhone; // 收货单位（人员）/电话 private String consigneePhone; // 收货单位（人员）/电话
private List<SparePartAudit> sparePartAuditList; //待入库的备件 private List<SparePartAudit> sparePartAuditList; //待入库的备件
private String warehouseName; // 所属仓库名 private String warehouseName; // 所属仓库名
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

2
admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java
View File

@ -31,6 +31,6 @@ public class SparePartAllotListVo implements Serializable {
private List<SparePartAudit> sparePartAuditList; //待入库的备件 private List<SparePartAudit> sparePartAuditList; //待入库的备件
private String importWarehouseName; // 调入仓库名 private String importWarehouseName; // 调入仓库名
private String exportWarehouseName; // 调出仓库名 private String exportWarehouseName; // 调出仓库名
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

2
admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java
View File

@ -31,6 +31,6 @@ public class SparePartInWarehouseListVo implements Serializable {
private String supplierPhone; // 供应商/电话 private String supplierPhone; // 供应商/电话
private List<SparePartAudit> sparePartAuditList; //待入库的备件 private List<SparePartAudit> sparePartAuditList; //待入库的备件
private String warehouseName; // 所属仓库名 private String warehouseName; // 所属仓库名
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

2
admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java
View File

@ -36,7 +36,7 @@ public class SparePartStockAuditDetailVo implements Serializable {
private String importWarehouseName; // 调入仓库名 private String importWarehouseName; // 调入仓库名
private String exportWarehouseName; // 调出仓库名 private String exportWarehouseName; // 调出仓库名
private List<SparePartAudit> sparePartAuditList; //待入库的备件 private List<SparePartAudit> sparePartAuditList; //待入库的备件
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
private String supplierPhone; // 供应商/电话 private String supplierPhone; // 供应商/电话
private String consigneePhone; // 收货单位（人员）/电话 private String consigneePhone; // 收货单位（人员）/电话

4
admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java
View File

@ -16,7 +16,7 @@ public class SparePartStockAuditListVo implements Serializable {
private Long id; // 主键id private Long id; // 主键id
private String receiptNumber; // 单据编号 private String receiptNumber; // 单据编号
private Long receiptType; // 单据类型（0=入库单，1=出库单，2=仓库调拨单） private Integer receiptType; // 单据类型（0=入库单，1=出库单，2=仓库调拨单）
private Long warehouseId; // 所属仓库 private Long warehouseId; // 所属仓库
private Long importWarehouse; // 调入仓库 private Long importWarehouse; // 调入仓库
private Long exportWarehouse; // 调出仓库 private Long exportWarehouse; // 调出仓库
@ -36,5 +36,5 @@ public class SparePartStockAuditListVo implements Serializable {
private String warehouseName; // 所属仓库名 private String warehouseName; // 所属仓库名
private String importWarehouseName; // 调入仓库名 private String importWarehouseName; // 调入仓库名
private String exportWarehouseName; // 调出仓库名 private String exportWarehouseName; // 调出仓库名
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

2
common/src/main/java/com/hcy/common/entity/sparePartStockAudit/SparePartStockAudit.java
View File

@ -36,5 +36,5 @@ public class SparePartStockAudit implements Serializable {
private Long updateTime; // 更新时间 private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间 private Long deleteTime; // 删除时间
private String sparePartAuditId; // 备件审核id private String sparePartAuditId; // 备件审核id
private Long outInWarehouseType; // 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） private Long outInWarehouseType; // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
} }

13
common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java
View File

@ -15,20 +15,19 @@ public enum AuditStateEnum {
AUDITED(1, "已审核"), AUDITED(1, "已审核"),
CANCELED(2,"已取消"), CANCELED(2,"已取消"),
NOTPASS(0,"未通过"), NOTPASS(1,"未通过"),
ALREADYPASSED(1, "已通过"), ALREADYPASSED(0, "已通过"),
// 单据类型（0=入库单，1=出库单，2=仓库调拨单） // 单据类型（0=入库单，1=出库单，2=仓库调拨单）
INWAREHOUSE(0, "入库单"), INWAREHOUSE(0, "入库单"),
OUTWAREHOUSE(1, "出库单"), OUTWAREHOUSE(1, "出库单"),
ALLOT(2,"仓库调拨单"), ALLOT(2,"仓库调拨单"),
// 出入库类别（0=采购入库，1=调拨出库，2=库存调拨，3=员工领料，4=销售出库） // 出入库类别（0=采购入库，1=库存调拨，2=员工领料，3=销售出库）
STOCKIN(0,"采购入库"), STOCKIN(0,"采购入库"),
STOCKOUT(1, "调拨出库"), STOCKTRANSFER(1, "库存调拨"),
STOCKTRANSFER(2, "库存调拨"), GETMATERIALS(2,"员工领料"),
GETMATERIALS(3,"员工领料"), SALESOUTBOUND(3, "销售出库");
SALESOUTBOUND(4, "销售出库");
private final int status; private final int status;
private final String desc; private final String desc;