From 71c9cb591d74fcab01163965e288158585f1d361 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 27 Nov 2023 08:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E8=AE=BE?= =?UTF-8?q?=E5=A4=87+=E8=AE=BE=E5=A4=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 16 +- .../com/op/device/domain/EquSpareApply.java | 5 +- .../com/op/device/mapper/EquOrderMapper.java | 3 - .../com/op/device/mapper/EquipmentMapper.java | 2 +- .../op/device/service/IDevicePDAService.java | 5 + .../service/impl/DevicePDAServiceImpl.java | 33 +- .../impl/EquSpareApplyServiceImpl.java | 31 +- .../mapper/device/EquOutsourceWorkMapper.xml | 3 +- .../mapper/device/EquRepairOrderMapper.xml | 2 +- .../device/EquRepairWorkOrderMapper.xml | 2 +- .../mapper/device/EquSpareApplyMapper.xml | 1 - op-modules/op-wms/pom.xml | 6 + .../controller/BaseEquipmentController.java | 109 +++- .../java/com/op/wms/domain/BaseEquipment.java | 249 +++++++- .../com/op/wms/domain/EquSpareEquipment.java | 169 ++++++ .../op/wms/domain/WmsSparePartsLedger.java | 569 ++++++++++++++++++ .../op/wms/mapper/BaseEquipmentMapper.java | 34 ++ .../op/wms/service/IBaseEquipmentService.java | 13 + .../impl/BaseEquipmentServiceImpl.java | 328 +++++++++- .../mapper/wms/BaseEquipmentMapper.xml | 295 ++++++++- .../mapper/wms/EquSpareEquipmentMapper.xml | 118 ++++ 21 files changed, 1957 insertions(+), 36 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/EquSpareEquipment.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSparePartsLedger.java create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/EquSpareEquipmentMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index cfdba65d..8a2cb991 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -1,6 +1,8 @@ package com.op.device.controller; +import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; import com.op.common.security.annotation.RequiresPermissions; import com.op.device.domain.*; import com.op.device.domain.dto.PDADTO; @@ -9,6 +11,8 @@ import com.op.device.service.IEquRepairOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * PDAController * @@ -17,7 +21,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/devicePDA") -public class DevicePDAController { +public class DevicePDAController extends BaseController { @Autowired private IDevicePDAService devicePDAService; @@ -119,6 +123,16 @@ public class DevicePDAController { return devicePDAService.selectEquEquipmentByEquEquipmentId(equipmentId); } + /** + * 查询设备列表 + */ + @GetMapping("/getEquipmentList") + public TableDataInfo getEquipmentList(EquEquipment equEquipment) { + startPage(); + List list = devicePDAService.selectEquEquipmentList(equEquipment); + return getDataTable(list); + } + /** * 获取维修详情 */ 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 76bba57d..30e6caed 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 @@ -23,7 +23,7 @@ public class EquSpareApply extends BaseEntity { private String applyId; /** 出库单号 */ - @Excel(name = "出库单号") + @Excel(name = "单号") private String applyCode; /** 备品备件编码 */ @@ -159,13 +159,14 @@ public class EquSpareApply extends BaseEntity { public String getApplyId() { return applyId; } + public void setApplyCode(String applyCode) { this.applyCode = applyCode; } - public String getApplyCode() { return applyCode; } + public void setSpareCode(String spareCode) { this.spareCode = spareCode; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 51604206..123d0396 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -4,11 +4,8 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; -import com.op.device.domain.EquOrderStandard; -import com.op.device.domain.EquPlan; import com.op.device.domain.dto.PDADTO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 计划工单Mapper接口 diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java index 1447f099..be07d674 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquipmentMapper.java @@ -6,7 +6,7 @@ public interface EquipmentMapper { /** * 查询设备管理 * - * @param equipmentId 设备管理主键 + * @param equipmentCode 设备管理主键 * @return 设备管理 */ public Equipment selectEquipmentByEquipmentCode(String equipmentCode); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index f559fe14..79af434c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -4,6 +4,8 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; import com.op.device.domain.dto.PDADTO; +import java.util.List; + /** * PDAService * @@ -103,4 +105,7 @@ public interface IDevicePDAService { * @return */ AjaxResult startMaintenanceTask(PDADTO pdadto); + + //查询设备列表 + List selectEquEquipmentList(EquEquipment equEquipment); } 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 b475a362..0f385a17 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 @@ -63,6 +63,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquFaultTypeMapper equFaultTypeMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; + /** * 获取今日巡检任务工单list-状态不为已完成 @@ -653,15 +656,17 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equOrderMapper.updateEquOrder(checkList); } - //新建申领单 缺少code + //新建申领单 List equSpareApplies = equRepairWorkOrder.getApplyList(); for(EquSpareApply equSpareApply:equSpareApplies){ //生成领料单code + String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber()); String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10); - equSpareApply.setApplyCode("A" + code ); + //十五位单号 + equSpareApply.setApplyCode("AW" + code + serialNum); equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); //备品备件规格型号！！！！！ - //equSpareApply.setSpareModel(equSpareApply.getS); +// equSpareApply.setSpareModel(equSpareApply.getS); equSpareApply.setSpareCode(equSpareApply.getMaterialCode()); equSpareApply.setSpareName(equSpareApply.getMaterialDesc()); equSpareApply.setApplyPeople(SecurityUtils.getUsername()); @@ -675,8 +680,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equSpareApplyMapper.insertEquSpareApply(equSpareApply); -// SparePartsLedger sparePartsLedger = new SparePartsLedger(); -// sparePartsLedger. + //更新完备品申领单后，更新库存 + SparePartsLedger sparePartsLedger = new SparePartsLedger(); + sparePartsLedger.setStorageId(equSpareApply.getStorageId()); + BigDecimal applyNum = equSpareApply.getSpareQuantity(); + BigDecimal amount = equSpareApply.getAmount(); + sparePartsLedger.setAmount(amount.subtract(applyNum)); + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); } //图片 @@ -734,4 +744,17 @@ public class DevicePDAServiceImpl implements IDevicePDAService { // // return treeAll; // } + + /** + * 查询设备管理列表 + * + * @param equEquipment 设备管理 + * @return 设备管理 + */ + @Override + @DS("#header.poolName") + public List selectEquEquipmentList(EquEquipment equEquipment) { + return equEquipmentMapper.selectEquEquipmentList(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 c698a0c0..f9a85cd9 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 @@ -87,11 +87,16 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { @DS("#header.poolName") public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply) { try { - //equSpareApply.getSpareApplyLists().size() 是在申领备件的时候进行的操作 + //equSpareApply.getSpareApplyLists().size() 是在维修申领备件的时候进行的操作 批量新增 if(equSpareApply.getSpareApplyLists().size() >= 1){ List list = equSpareApply.getSpareApplyLists(); for(EquSpareApply applyList:list){ applyList.setApplyId(IdUtils.fastSimpleUUID()); + //生成领料单code //申领单号 + String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber()); + String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + applyList.getWorkCode().substring(2); + //申领单号 + equSpareApply.setApplyCode("AW" + code + serialNum); //领用时间 applyList.setApplyTime(DateUtils.getNowDate()); //申领人 @@ -100,6 +105,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; applyList.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + //创建人、创建时间 applyList.setCreateTime(DateUtils.getNowDate()); applyList.setCreateBy(SecurityUtils.getUsername()); equSpareApplyMapper.insertEquSpareApply(applyList); @@ -113,13 +119,36 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { } }else{ equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); + String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber()); + if(equSpareApply.getWorkCode().length() == 12){ + //生成领料单code 十五位单号 + equSpareApply.setApplyCode("A" + equSpareApply.getWorkCode() + serialNum); + }else if(equSpareApply.getWorkCode().length() > 12){ + equSpareApply.setApplyCode("AW" + equSpareApply.getWorkCode().substring(2) + serialNum); + }else{ + //普通申领单 + equSpareApply.setApplyCode("AN" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equSpareApply.getSpareUseEquipment() + serialNum); + } + //领用时间 + equSpareApply.setApplyTime(DateUtils.getNowDate()); + //申领人 + equSpareApply.setApplyPeople(SecurityUtils.getUsername()); //工厂号 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + //创建人、创建时间 equSpareApply.setCreateTime(DateUtils.getNowDate()); equSpareApply.setCreateBy(SecurityUtils.getUsername()); equSpareApplyMapper.insertEquSpareApply(equSpareApply); + + //更新完备品申领单后，更新库存 + SparePartsLedger sparePartsLedger = new SparePartsLedger(); + sparePartsLedger.setStorageId(equSpareApply.getStorageId()); + BigDecimal applyNum = equSpareApply.getSpareQuantity(); + BigDecimal amount = equSpareApply.getAmount(); + sparePartsLedger.setAmount(amount.subtract(applyNum)); + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); } return success("新增申领记录成功！"); } catch (Exception e) { diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml index 405463bd..839ab7f0 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml @@ -199,10 +199,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index c79ff78a..e389e934 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -261,11 +261,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from equ_repair_order where order_code = #{repairCode} and del_flag = '0' + SELECT COUNT(work_id)+1 AS serialNum FROM equ_repair_work_order - where del_flag = '0' @@ -63,6 +187,20 @@ and hourly_unit_price = #{hourlyUnitPrice} and plc_ip = #{plcIp} and plc_port = #{plcPort} + and equipment_head = #{equipmentHead} + and equipment_barcode = #{equipmentBarcode} + and equipment_barcode_image = #{equipmentBarcodeImage} + and manufacturer = #{manufacturer} + and supplier = #{supplier} + and use_life = #{useLife} + and buy_time = #{buyTime} + and asset_original_value = #{assetOriginalValue} + and net_asset_value = #{netAssetValue} + and asset_head = #{assetHead} + and fixed_asset_code = #{fixedAssetCode} + and department = #{department} + and sap_asset = #{sapAsset} + and factory_code = #{factoryCode} and del_flag ='0' @@ -102,6 +240,20 @@ hourly_unit_price, plc_ip, plc_port, + equipment_barcode, + equipment_barcode_image, + manufacturer, + supplier, + use_life, + buy_time, + asset_original_value, + net_asset_value, + asset_head, + fixed_asset_code, + department, + sap_asset, + equipment_head, + factory_code, #{equipmentCode}, @@ -130,6 +282,20 @@ #{hourlyUnitPrice}, #{plcIp}, #{plcPort}, + #{equipmentBarcode}, + #{equipmentBarcodeImage}, + #{manufacturer}, + #{supplier}, + #{useLife}, + #{buyTime}, + #{assetOriginalValue}, + #{netAssetValue}, + #{assetHead}, + #{fixedAssetCode}, + #{department}, + #{sapAsset}, + #{equipmentHead}, + #{factoryCode}, @@ -162,6 +328,20 @@ hourly_unit_price = #{hourlyUnitPrice}, plc_ip = #{plcIp}, plc_port = #{plcPort}, + equipment_barcode = #{equipmentBarcode}, + equipment_barcode_image = #{equipmentBarcodeImage}, + manufacturer = #{manufacturer}, + supplier = #{supplier}, + use_life = #{useLife}, + buy_time = #{buyTime}, + asset_original_value = #{assetOriginalValue}, + net_asset_value = #{netAssetValue}, + asset_head = #{assetHead}, + fixed_asset_code = #{fixedAssetCode}, + department = #{department}, + sap_asset = #{sapAsset}, + equipment_head = #{equipmentHead}, + factory_code = #{factoryCode}, where equipment_id = #{equipmentId} @@ -223,4 +403,115 @@ group by equipment_type_code,equipment_type_name + + + + + + + + insert into equ_spare_equipment + + id, + spare_code, + spare_type, + spare_name, + equipment_name, + equipment_code, + del_flag, + create_by, + create_time, + update_by, + update_time, + factory_code, + + + #{id}, + #{spareCode}, + #{spareType}, + #{spareName}, + #{equipmentName}, + #{equipmentCode}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + + + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + + + + + + + delete from base_file where source_id = #{sourceId} + + + + delete from equ_spare_equipment where equipment_code = #{equipmentCode} + + + + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/EquSpareEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/EquSpareEquipmentMapper.xml new file mode 100644 index 00000000..af34ca4c --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/EquSpareEquipmentMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, spare_code, spare_type, spare_name, equipment_name, equipment_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_spare_equipment + + + + + + + + insert into equ_spare_equipment + + id, + spare_code, + spare_type, + spare_name, + equipment_name, + equipment_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + factory_code, + + + #{id}, + #{spareCode}, + #{spareType}, + #{spareName}, + #{equipmentName}, + #{equipmentCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + + + + + update equ_spare_equipment + + spare_code = #{spareCode}, + spare_type = #{spareType}, + spare_name = #{spareName}, + equipment_name = #{equipmentName}, + equipment_code = #{equipmentCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + + where id = #{id} + + + + delete from equ_spare_equipment where id = #{id} + + + + delete from equ_spare_equipment where id in + + #{id} + + + \ No newline at end of file