From 1225206e7384163edc374cb3836d0d2191380ceb Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jan 2024 17:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=94=B3=E9=A2=86=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BB=B7=E6=80=BB=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquSpareApply.java | 22 +++++++++++++++++++ .../service/impl/DevicePDAServiceImpl.java | 7 +++--- .../impl/EquSpareApplyServiceImpl.java | 2 ++ .../mapper/device/EquSpareApplyMapper.xml | 14 ++++++++++-- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 30e6caed..66a0b26e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -114,6 +114,28 @@ public class EquSpareApply extends BaseEntity { @Excel(name = "物料描述") private String materialDesc; + /** 单价 */ + @Excel(name = "单价") + private BigDecimal unitPrice; + + /** 总价 */ + @Excel(name = "总价") + private BigDecimal totalPrice; + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; + } + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + public BigDecimal getTotalPrice() { + return totalPrice; + } + public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index ffe5ad7d..8d4d6e3e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -782,6 +782,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; //工厂号 + //备件费用？？？？？ equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); equSpareApplyMapper.insertEquSpareApply(equSpareApply); @@ -832,9 +833,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { EquRepairWorkOrder example = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); // 费用 - BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); - BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); - equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); +// BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); +// BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); +// equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); //修改设备状态 由维修中改为正常运行 EquEquipment equEquipment = new EquEquipment(); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index 8e17be26..a40ad214 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -95,6 +95,8 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { String code = applyList.getWorkCode(); applyList.setApplyCode("AW" + code.substring(2) + serialNum); } + //总价 +// applyList.setTotalPrice(applyList.getAmount().multiply(applyList.getUnitPrice())); //领用时间 applyList.setApplyTime(DateUtils.getNowDate()); //申领人 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml index 5dd6de5c..e55d87bc 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -28,10 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_apply + select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code , unit_price , total_price from equ_spare_apply select SUM(a.spare_quantity * w.unit_price) from equ_spare_apply a - left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code + left join wms_ods_mate_storage_news_attached w on a.spare_code = w.primary_code where a.work_code = #{orderCode}